CM11 Themes: Handle legacy themes in createIdmapsForPackageLI (7f011fc4) · Commits · e / os / android_frameworks_base

services/java/com/android/server/pm/PackageManagerService.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -3656,15 +3656,23 @@ public class PackageManagerService extends IPackageManager.Stub {

		private boolean createIdmapsForPackageLI(PackageParser.Package pkg) {
		HashMap<String, PackageParser.Package> overlays = mOverlays.get(pkg.packageName);
		final String pkgName = pkg.packageName;
		if (overlays == null) {
		Log.w(TAG, "Unable to create idmap for " + pkg.packageName + ": no overlay packages");
		Log.w(TAG, "Unable to create idmap for " + pkgName + ": no overlay packages");
		return false;
		}
		for (PackageParser.Package opkg : overlays.values()) {
		for(String overlayTarget : opkg.mOverlayTargets) {
		if (overlayTarget.equals(pkg.packageName)) {
		if (!createIdmapForPackagePairLI(pkg, opkg, "")) {
		return false;
		if (overlayTarget.equals(pkgName)) {
		try {
		if (opkg.mIsLegacyThemeApk) {
		generateIdmapForLegacyTheme(pkgName, opkg);
		} else {
		generateIdmap(pkgName, opkg);
		}
		} catch (IOException e) {
		Log.w(TAG, "Unable to create idmap for " + pkgName
		+ ": no overlay packages", e);
		}
		}
		}