From 7502b327df4553ca21c6d11be6ca9aa17b0b2f99 Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Tue, 1 Aug 2017 17:13:43 -0700
Subject: [PATCH] Prevent crash dialogs from appearing in demo mode

Bug: 62712426
Test: runtest -p com.android.server.am frameworks-services
Change-Id: I73162e6cabfc57ecf549c772fb4d00eb862814fb
---
 .../java/com/android/server/am/ActivityManagerService.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 803d8f0944c2f..84017e7beb58e 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 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(