Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev

2017-08-02 23:09:40 +00:00
parent ad825bdfd7 dc84d28a79
commit 93111a9762
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -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(