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

2017-08-02 21:54:28 +00:00
parent 46f2cdeb63 7502b327df
commit 8d753bc3a3
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(