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

am: 8d753bc3a3 Change-Id: If7bc865f712dd09257ea07c01a90bc91531ab3b9
2017-08-02 22:03:42 +00:00
parent 9dbda410bc 8d753bc3a3
commit 27191ac475
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
@@ -719,7 +719,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(