Merge "Revert "Temporary stop-gap for Chrome target SDK issue."" into sc-dev (8a6ffdc5) · Commits · e / os / android_frameworks_base

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