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

Merge "Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev am: d7b9669b54" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-01 23:14:54 +00:00
committed by Android (Google) Code Review
parent 97cbc0ad3b 073879caf1
commit 11ac61453f
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

@@ -18581,7 +18581,7 @@ public final class ActivityManagerService extends ActivityManagerNative
&& config.navigation == Configuration.NAVIGATION_NONAV); && config.navigation == Configuration.NAVIGATION_NONAV);
int modeType = config.uiMode & Configuration.UI_MODE_TYPE_MASK; int modeType = config.uiMode & Configuration.UI_MODE_TYPE_MASK;
final boolean uiModeSupportsDialogs = (modeType != Configuration.UI_MODE_TYPE_CAR 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; return inputMethodExists && uiModeSupportsDialogs && !inVrMode;
} }