Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class."

Browse Source 
* commit 'ab561f5b4073055c414866ff3dbe8372263474a7':
  Don't make isSafeMode a field on the Zygote class.
This commit is contained in:
Narayan Kamath
2014-03-31 12:42:14 +00:00
committed by Android Git Automerger
parent 0e3f3c7022 ab561f5b40
commit 439145f0e7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/SystemServer.java
View File

@@ -824,7 +824,7 @@ class ServerThread {
if (safeMode) { if (safeMode) {
ActivityManagerService.self().enterSafeMode(); ActivityManagerService.self().enterSafeMode();
// Post the safe mode state in the Zygote class // Post the safe mode state in the Zygote class
Zygote.systemInSafeMode = true; SystemServer.inSafeMode = true;
// Disable the JIT for the system_server process // Disable the JIT for the system_server process
VMRuntime.getRuntime().disableJitCompilation(); VMRuntime.getRuntime().disableJitCompilation();
} else { } else {
@@ -1117,6 +1117,11 @@ public class SystemServer {
// give any timezone code room without going into negative time. // give any timezone code room without going into negative time.
private static final long EARLIEST_SUPPORTED_TIME = 86400 * 1000; 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. * Called to initialize native system services.
*/ */

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -2768,7 +2768,7 @@ public final class ActivityManagerService extends ActivityManagerNative
// Run the app in safe mode if its manifest requests so or the // Run the app in safe mode if its manifest requests so or the
// system is booted in safe mode. // system is booted in safe mode.
if ((app.info.flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0 || if ((app.info.flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0 ||
Zygote.systemInSafeMode == true) { SystemServer.inSafeMode == true) {
debugFlags |= Zygote.DEBUG_ENABLE_SAFEMODE; debugFlags |= Zygote.DEBUG_ENABLE_SAFEMODE;
} }
if ("1".equals(SystemProperties.get("debug.checkjni"))) { if ("1".equals(SystemProperties.get("debug.checkjni"))) {