diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 650a52a4cd3e..bcad2fc09602 100644 --- 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( |