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

am: 27191ac475 Change-Id: I195d9e0f5536ac12ae4622e011fb3a0f0b01d3c3
2017-08-02 23:29:12 +00:00
parent 7b1d7a4262 27191ac475
commit e9e36ef23f
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(