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

Commit 41f1ef8c authored Nov 10, 2017 by Treehugger Robot Committed by Gerrit Code Review Nov 10, 2017

Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"

parents 3e9b9b74 66a285d9

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3857,7 +3857,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		if (app.info.isPrivilegedApp() &&
		!SystemProperties.getBoolean("pm.dexopt.priv-apps", true)) {
		SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false)) {
		runtimeFlags \|= Zygote.DISABLE_VERIFIER;
		runtimeFlags \|= Zygote.ONLY_USE_SYSTEM_OAT_FILES;
		}

services/core/java/com/android/server/pm/PackageDexOptimizer.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,9 +110,9 @@ public class PackageDexOptimizer {
		return false;
		}

		// We do not dexopt a priv-app package when pm.dexopt.priv-apps is false.
		// We do not dexopt a priv-app package when pm.dexopt.priv-apps-oob is true.
		if (pkg.isPrivilegedApp()) {
		return SystemProperties.getBoolean("pm.dexopt.priv-apps", true);
		return !SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false);
		}

		return true;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -10270,7 +10270,7 @@ public class PackageManagerService extends IPackageManager.Stub

		if (Build.IS_DEBUGGABLE &&
		pkg.isPrivilegedApp() &&
		!SystemProperties.getBoolean("pm.dexopt.priv-apps", true)) {
		SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false)) {
		PackageManagerServiceUtils.logPackageHasUncompressedCode(pkg);
		}