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

Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev

Browse Source
This commit is contained in:
Christine Franks
2017-08-02 21:54:28 +00:00
committed by Android (Google) Code Review
parent 46f2cdeb63 7502b327df
commit 8d753bc3a3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -719,7 +719,9 @@ public class ActivityManagerService extends IActivityManager.Stub
public boolean canShowErrorDialogs() { public boolean canShowErrorDialogs() {
return mShowDialogs && !mSleeping && !mShuttingDown return mShowDialogs && !mSleeping && !mShuttingDown
&& !mKeyguardController.isKeyguardShowing(); && !mKeyguardController.isKeyguardShowing()
&& !(UserManager.isDeviceInDemoMode(mContext)
&& mUserController.getCurrentUser().isDemo());
} }
private static ThreadPriorityBooster sThreadPriorityBooster = new ThreadPriorityBooster( private static ThreadPriorityBooster sThreadPriorityBooster = new ThreadPriorityBooster(