From 09c3f2d0025985293b1176b49b1df2ca27bbec85 Mon Sep 17 00:00:00 2001
From: Michael Kwan <mkwan@google.com>
Date: Mon, 16 May 2016 09:00:00 -0700
Subject: [PATCH] Allow ANR dialogs for Watch eng builds.

Bug: 20024319
Change-Id: Idf966155c2b1e081f59d55b09e544d2c2adfbd2b
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 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 2b89fdfba11af..0c0320c97eeb9 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -18342,7 +18342,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                                    && 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);
+                && (modeType != Configuration.UI_MODE_TYPE_WATCH || "eng".equals(Build.TYPE)));
         return inputMethodExists && uiModeSupportsDialogs && !inVrMode;
     }