resolved conflicts for merge of 9af19bee to klp-dev-plus-aosp (22abe382) · Commits · e / os / android_frameworks_base

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

+11 −4

Original line number	Diff line number	Diff line
		@@ -218,6 +218,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		static final int SCAN_DEFER_DEX = 1<<7;
		static final int SCAN_BOOTING = 1<<8;
		static final int SCAN_TRUSTED_OVERLAY = 1<<9;
		static final int SCAN_DELETE_DATA_ON_FAILURES = 1<<10;

		static final int REMOVE_CHATTY = 1<<16;

		@@ -341,7 +342,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		new HashMap<String, PackageParser.Package>();

		// Information for the parser to write more useful error messages.
		File mScanningPath;
		int mLastScanError;

		// ----------------------------------------------------------------
		@@ -4227,7 +4227,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		mLastScanError = PackageManager.INSTALL_FAILED_INVALID_APK;
		return null;
		}
		mScanningPath = scanFile;

		if ((parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) {
		pkg.applicationInfo.flags \|= ApplicationInfo.FLAG_SYSTEM;
		@@ -4247,7 +4246,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		if (mAndroidApplication != null) {
		Slog.w(TAG, "*************************************************");
		Slog.w(TAG, "Core android package being redefined. Skipping.");
		Slog.w(TAG, " file=" + mScanningPath);
		Slog.w(TAG, " file=" + scanFile);
		Slog.w(TAG, "*************************************************");
		mLastScanError = PackageManager.INSTALL_FAILED_DUPLICATE_PACKAGE;
		return null;
		@@ -4727,6 +4726,10 @@ public class PackageManagerService extends IPackageManager.Stub {
		if ((scanMode&SCAN_NO_DEX) == 0) {
		if (performDexOptLI(pkg, forceDex, (scanMode&SCAN_DEFER_DEX) != 0, false)
		== DEX_OPT_FAILED) {
		if ((scanMode & SCAN_DELETE_DATA_ON_FAILURES) != 0) {
		removeDataDirsLI(pkg.packageName);
		}

		mLastScanError = PackageManager.INSTALL_FAILED_DEXOPT;
		return null;
		}
		@@ -4804,6 +4807,10 @@ public class PackageManagerService extends IPackageManager.Stub {
		PackageParser.Package clientPkg = clientLibPkgs.get(i);
		if (performDexOptLI(clientPkg, forceDex, (scanMode&SCAN_DEFER_DEX) != 0, false)
		== DEX_OPT_FAILED) {
		if ((scanMode & SCAN_DELETE_DATA_ON_FAILURES) != 0) {
		removeDataDirsLI(pkg.packageName);
		}

		mLastScanError = PackageManager.INSTALL_FAILED_DEXOPT;
		return null;
		}
		@@ -9181,7 +9188,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		replacePackageLI(pkg, parseFlags, scanMode, args.user,
		installerPackageName, res);
		} else {
		installNewPackageLI(pkg, parseFlags, scanMode, args.user,
		installNewPackageLI(pkg, parseFlags, scanMode \| SCAN_DELETE_DATA_ON_FAILURES, args.user,
		installerPackageName, res);
		}
		synchronized (mPackages) {