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

Commit 376988d5 authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into... 

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3 am: 27191ac4" into oc-mr1-dev-plus-aosp
am: a336d8a5

Change-Id: I7bc11d9f0dca717c850c0de3f86dcc835e0f92ca
parents ca7e0246 a336d8a5

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

+3 −1
Original line number Diff line number Diff line
@@ -714,7 +714,9 @@ public class ActivityManagerService extends IActivityManager.Stub 














    public boolean canShowErrorDialogs() {















        return mShowDialogs && !mSleeping && !mShuttingDown













                && !mKeyguardController.isKeyguardShowing();













                && !mKeyguardController.isKeyguardShowing()













                && !(UserManager.isDeviceInDemoMode(mContext)













                        && mUserController.getCurrentUser().isDemo());















    }





























    private static ThreadPriorityBooster sThreadPriorityBooster = new ThreadPriorityBooster(