diff options
| author | 2017-08-02 23:07:31 +0000 | |
|---|---|---|
| committer | 2017-08-02 23:07:31 +0000 | |
| commit | dc84d28a79f40ddaef5584f17f3b27b830881609 (patch) | |
| tree | 03b175fd2ebe277b860db3a9e1d75c76be9d88dd | |
| parent | 8b6bff45f8a5b90cb2a34a9dd43c8ac89134d081 (diff) | |
| parent | 8d753bc3a32bf99a47345b392e7d812cc2e0c49a (diff) | |
Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev
am: 8d753bc3a3
Change-Id: I138f6c945606caaaf129de5625c4d9bb7add42d8
| -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( |