commit 59f05690e255552804e1c47e8fa5329adbe9be09
author Erik Wolsheimer <ewol@google.com> Tue May 31 14:08:24 2016 -0700
committer Erik Wolsheimer <ewol@google.com> Tue May 31 21:26:36 2016 -0700
tree 6562741e453d97b05920414770cfa55a576c3931
parent 2ab4ac38350b51c239fe564bc89727b201036205

Show crash/ANR dialogs on userdebug watch builds

BUG: 28960987
Change-Id: Iaa237df9578816b91638d0bef0e0730721d62ba2

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 e07243f..4d117e6 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -18578,7 +18578,7 @@
                                    && config.navigation == Configuration.NAVIGATION_NONAV);
         int modeType = config.uiMode & Configuration.UI_MODE_TYPE_MASK;
         final boolean uiModeSupportsDialogs = (modeType != Configuration.UI_MODE_TYPE_CAR
-                && (modeType != Configuration.UI_MODE_TYPE_WATCH || "eng".equals(Build.TYPE)));
+                && !(modeType == Configuration.UI_MODE_TYPE_WATCH && "user".equals(Build.TYPE)));
         return inputMethodExists && uiModeSupportsDialogs && !inVrMode;
     }