Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev

Browse Source 
am: 0092f82d4c

* commit '0092f82d4c9e439d6930dcd1a7ac42987faf865a':
  Allow ANR dialogs for Watch eng builds.

Change-Id: I3182845d80bacb426363b9245ee49390846d9c15
This commit is contained in:
Michael Kwan
2016-05-16 22:31:41 +00:00
committed by android-build-merger
parent 47ad72994e 0092f82d4c
commit c995c6329a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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;
}