Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb6ae755 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ia14ac17bda3ac51c246b734a15bdced7b654aa93
parents 4d70cc3d dfe5f0c2

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+8 −0
Original line number Diff line number Diff line
@@ -2807,7 +2807,15 @@ 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);