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

Commit 86ae7ee5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14200623, 14200667, 14200697] into sc-release 

Change-Id: If1849512cdbc0a3597ea99d7c3d3d404ccfec5d8
parents 5ce9835c 60e0b4af

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

+6 −0
Original line number Diff line number Diff line
@@ -2800,6 +2800,12 @@ public class ParsingPackageUtils { 
    }



    private void convertSplitPermissions(ParsingPackage pkg) {

        // STOPSHIP(b/183905675): REMOVE THIS TERRIBLE, HORRIBLE, NO GOOD, VERY BAD HACK

        if ("com.android.chrome".equals(pkg.getPackageName())

                && (445500383 == pkg.getVersionCode() || 438500084 == pkg.getVersionCode())) {

            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);