commit 7502b327df4553ca21c6d11be6ca9aa17b0b2f99
author Christine Franks <christyfranks@google.com> Tue Aug 01 17:13:43 2017 -0700
committer Christine Franks <christyfranks@google.com> Tue Aug 01 17:40:44 2017 -0700
tree d1e361071c48c60f3f86d4656e5647c5a73f2291
parent f3562ffdfbb31638297c983221626d94e81ab084

Prevent crash dialogs from appearing in demo mode

Bug: 62712426
Test: runtest -p com.android.server.am frameworks-services
Change-Id: I73162e6cabfc57ecf549c772fb4d00eb862814fb

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 803d8f0..84017e7 100644
--- 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 boolean canShowErrorDialogs() {
         return mShowDialogs && !mSleeping && !mShuttingDown
-                && !mKeyguardController.isKeyguardShowing();
+                && !mKeyguardController.isKeyguardShowing()
+                && !(UserManager.isDeviceInDemoMode(mContext)
+                        && mUserController.getCurrentUser().isDemo());
     }
 
     private static ThreadPriorityBooster sThreadPriorityBooster = new ThreadPriorityBooster(