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 am: 0092f82d4c

Browse Source 
am: c995c6329a

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

Change-Id: Ia58055d661918bdbd89a418502f5c58ee38500b8
This commit is contained in:
Michael Kwan
2016-05-16 22:43:05 +00:00
committed by android-build-merger
parent 39c2089164 c995c6329a
commit c4f497694f
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

@@ -18346,7 +18346,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;
}