Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am: 50cfaa40ca am: 97a970e56b (71e8c409) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/Zygote.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ public final class Zygote {
		public static final int DISABLE_VERIFIER = 1 << 9;
		/** Only use oat files located in /system. Otherwise use dex/jar/apk . */
		public static final int ONLY_USE_SYSTEM_OAT_FILES = 1 << 10;
		/** Do not enfore hidden API access restrictions. */
		public static final int DISABLE_HIDDEN_API_CHECKS = 1 << 11;

		/** No external storage should be mounted. */
		public static final int MOUNT_EXTERNAL_NONE = IVold.REMOUNT_MODE_NONE;
		@@ -156,6 +158,9 @@ public final class Zygote {
		*/
		public static int forkSystemServer(int uid, int gid, int[] gids, int runtimeFlags,
		int[][] rlimits, long permittedCapabilities, long effectiveCapabilities) {
		// SystemServer is always allowed to use hidden APIs.
		runtimeFlags \|= DISABLE_HIDDEN_API_CHECKS;

		VM_HOOKS.preFork();
		// Resets nice priority for zygote process.
		resetNicePriority();

+6 −0

Original line number	Diff line number	Diff line
		@@ -4064,6 +4064,12 @@ public class ActivityManagerService extends IActivityManager.Stub
		runtimeFlags \|= Zygote.ONLY_USE_SYSTEM_OAT_FILES;
		}

		if (app.info.isAllowedToUseHiddenApi()) {
		// This app is allowed to use undocumented and private APIs. Set
		// up its runtime with the appropriate flag.
		runtimeFlags \|= Zygote.DISABLE_HIDDEN_API_CHECKS;
		}

		String invokeWith = null;
		if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
		// Debuggable apps may include a wrapper script with their library directory.