drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp

Browse Source 
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
This commit is contained in:
Narayan Kamath
2014-03-31 13:54:30 +01:00
parent 303d666f2e 439145f0e7
commit 56a8f8b48f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@ -930,6 +930,11 @@ public final class ActivityManagerService extends ActivityManagerNative
*/ */
boolean mDidDexOpt; boolean mDidDexOpt;
/**
* Set if the systemServer made a call to enterSafeMode.
*/
boolean mSafeMode;
String mDebugApp = null; String mDebugApp = null;
boolean mWaitForDebugger = false; boolean mWaitForDebugger = false;
boolean mDebugTransient = false; boolean mDebugTransient = false;
@ -2719,7 +2724,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) { mSafeMode == 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"))) {
@ -8727,6 +8732,8 @@ public final class ActivityManagerService extends ActivityManagerNative
} catch (RemoteException e) { } catch (RemoteException e) {
} }
} }
mSafeMode = true;
} }
} }

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

@ -912,8 +912,6 @@ public final class SystemServer {
final boolean safeMode = wm.detectSafeMode(); final boolean safeMode = wm.detectSafeMode();
if (safeMode) { if (safeMode) {
mActivityManagerService.enterSafeMode(); mActivityManagerService.enterSafeMode();
// Post the safe mode state in the Zygote class
Zygote.systemInSafeMode = 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 {