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

Commit 32b756cf authored by Winson Chiu's avatar Winson Chiu
Browse files

Revert "Temporary stop-gap for Chrome target SDK issue." 

This reverts commit c6be9fe4.

Reason for revert: No longer needed, Chrome targets 30

Bug: 183905675

Change-Id: I7db4fda4f233414330c4daa38a96d088bd56ee09
parent c6be9fe4

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

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