diff options
| author | Winson Chiu <chiuwinson@google.com> | 2021-05-17 19:07:38 +0000 |
|---|---|---|
| committer | Winson Chiu <chiuwinson@google.com> | 2021-05-17 19:08:40 +0000 |
| commit | 32b756cfaea2f11e6df60a0f0b3f417fca534718 (patch) | |
| tree | 608f59ea87a0d38c6d54204ce8aa227af16a6afc /core/java/android | |
| parent | c6be9fe47041743619d7e9ed7cf95e7c9207f825 (diff) | |
Revert "Temporary stop-gap for Chrome target SDK issue."
This reverts commit c6be9fe47041743619d7e9ed7cf95e7c9207f825.
Reason for revert: No longer needed, Chrome targets 30
Bug: 183905675
Change-Id: I7db4fda4f233414330c4daa38a96d088bd56ee09
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/parsing/ParsingPackageUtils.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/content/pm/parsing/ParsingPackageUtils.java b/core/java/android/content/pm/parsing/ParsingPackageUtils.java index 2adf266ef4b7..a1ffc0ca5378 100644 --- a/core/java/android/content/pm/parsing/ParsingPackageUtils.java +++ b/core/java/android/content/pm/parsing/ParsingPackageUtils.java @@ -2799,15 +2799,7 @@ public class ParsingPackageUtils { } } - @SuppressWarnings("AndroidFrameworkCompatChange") private void convertSplitPermissions(ParsingPackage pkg) { - // STOPSHIP(b/183905675): REMOVE THIS TERRIBLE, HORRIBLE, NO GOOD, VERY BAD HACK - if ("com.android.chrome".equals(pkg.getPackageName()) - && pkg.getVersionCode() <= 445500399 - && pkg.getTargetSdkVersion() > Build.VERSION_CODES.R) { - pkg.setTargetSdkVersion(Build.VERSION_CODES.R); - } - final int listSize = mSplitPermissionInfos.size(); for (int is = 0; is < listSize; is++) { final PermissionManager.SplitPermissionInfo spi = mSplitPermissionInfos.get(is); |