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

Commit c41972fa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I81ce634f851456cfbf19db21e0f083907c217eec
parents 40fa5117 05f06126

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

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