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

Merge "Revert "Temporary stop-gap for Chrome target SDK issue."" into sc-dev am: 8a6ffdc597

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14604267

Change-Id: I298a0431ed1e8a841fce07f01374d57234089a76
This commit is contained in:
TreeHugger Robot
2021-05-17 23:48:14 +00:00
committed by Automerger Merge Worker
parent 35eeb4e640 8a6ffdc597
commit 05f0612630
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2816,15 +2816,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);