diff options
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 7 | ||||
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index d895137a8d12..f2269727dd59 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -824,7 +824,7 @@ class ServerThread { if (safeMode) { ActivityManagerService.self().enterSafeMode(); // Post the safe mode state in the Zygote class - Zygote.systemInSafeMode = true; + SystemServer.inSafeMode = true; // Disable the JIT for the system_server process VMRuntime.getRuntime().disableJitCompilation(); } else { @@ -1117,6 +1117,11 @@ public class SystemServer { // give any timezone code room without going into negative time. private static final long EARLIEST_SUPPORTED_TIME = 86400 * 1000; + /** + * When set, all subsequent apps will be launched in safe mode. + */ + public static boolean inSafeMode; + /** * Called to initialize native system services. */ diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 97696a5d8fbf..4258a1b19e96 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -2768,7 +2768,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) { + SystemServer.inSafeMode == true) { debugFlags |= Zygote.DEBUG_ENABLE_SAFEMODE; } if ("1".equals(SystemProperties.get("debug.checkjni"))) { |