am 439cf5b4: am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp (e4027744) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -945,6 +945,11 @@ public final class ActivityManagerService extends ActivityManagerNative
		*/
		boolean mDidDexOpt;

		/**
		* Set if the systemServer made a call to enterSafeMode.
		*/
		boolean mSafeMode;

		String mDebugApp = null;
		boolean mWaitForDebugger = false;
		boolean mDebugTransient = false;
		@@ -2737,7 +2742,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		// Run the app in safe mode if its manifest requests so or the
		// system is booted in safe mode.
		if ((app.info.flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0 \|\|
		Zygote.systemInSafeMode == true) {
		mSafeMode == true) {
		debugFlags \|= Zygote.DEBUG_ENABLE_SAFEMODE;
		}
		if ("1".equals(SystemProperties.get("debug.checkjni"))) {
		@@ -8963,6 +8968,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		} catch (RemoteException e) {
		}
		}

		mSafeMode = true;
		}
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -921,8 +921,6 @@ public final class SystemServer {
		final boolean safeMode = wm.detectSafeMode();
		if (safeMode) {
		mActivityManagerService.enterSafeMode();
		// Post the safe mode state in the Zygote class
		Zygote.systemInSafeMode = true;
		// Disable the JIT for the system_server process
		VMRuntime.getRuntime().disableJitCompilation();
		} else {