Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a8f8b4 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

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

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
parents 303d666f 439145f0

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

+8 −1
Original line number Diff line number Diff line
@@ -930,6 +930,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;










@@ -2719,7 +2724,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"))) {










@@ -8727,6 +8732,8 @@ public final class ActivityManagerService extends ActivityManagerNative













                } catch (RemoteException e) {















                }















            }

























            mSafeMode = true;















        }















    }















































services/java/com/android/server/SystemServer.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -912,8 +912,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 {