Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Temporary stop-gap for Chrome target SDK issue." into sc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2021-04-15 19:04:57 +00:00
committed by Android (Google) Code Review
parent ca6a54ed9b c6be9fe470
commit dfe5f0c26f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/pm/parsing/ParsingPackageUtils.java
View File

@@ -2807,7 +2807,15 @@ public class ParsingPackageUtils {
} }
} }
@SuppressWarnings("AndroidFrameworkCompatChange")
private void convertSplitPermissions(ParsingPackage pkg) { 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(); final int listSize = mSplitPermissionInfos.size();
for (int is = 0; is < listSize; is++) { for (int is = 0; is < listSize; is++) {
final PermissionManager.SplitPermissionInfo spi = mSplitPermissionInfos.get(is); final PermissionManager.SplitPermissionInfo spi = mSplitPermissionInfos.get(is);