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

Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Id964f7b5ffed9c9836f8fd8db2d958f8ea9be582
This commit is contained in:
Nikolas Havrikov
2020-06-19 18:01:06 +00:00
committed by Automerger Merge Worker
parent 177977cc41 0cf1ad8495
commit a457821085
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/ActivityTaskManager.java
View File

@@ -433,13 +433,21 @@ public class ActivityTaskManager {
} }
} }
/** Returns whether the current UI mode supports error dialogs (ANR, crash, etc). */ /**
public static boolean currentUiModeSupportsErrorDialogs(@NonNull Context context) { * @return whether the UI mode of the given config supports error dialogs (ANR, crash, etc).
final Configuration config = context.getResources().getConfiguration(); * @hide
*/
public static boolean currentUiModeSupportsErrorDialogs(@NonNull Configuration config) {
int modeType = config.uiMode & Configuration.UI_MODE_TYPE_MASK; int modeType = config.uiMode & Configuration.UI_MODE_TYPE_MASK;
return (modeType != Configuration.UI_MODE_TYPE_CAR return (modeType != Configuration.UI_MODE_TYPE_CAR
&& !(modeType == Configuration.UI_MODE_TYPE_WATCH && Build.IS_USER) && !(modeType == Configuration.UI_MODE_TYPE_WATCH && Build.IS_USER)
&& modeType != Configuration.UI_MODE_TYPE_TELEVISION && modeType != Configuration.UI_MODE_TYPE_TELEVISION
&& modeType != Configuration.UI_MODE_TYPE_VR_HEADSET); && modeType != Configuration.UI_MODE_TYPE_VR_HEADSET);
} }
/** @return whether the current UI mode supports error dialogs (ANR, crash, etc). */
public static boolean currentUiModeSupportsErrorDialogs(@NonNull Context context) {
final Configuration config = context.getResources().getConfiguration();
return currentUiModeSupportsErrorDialogs(config);
}
} }

2
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -5413,7 +5413,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
final boolean hideDialogsSet = Settings.Global.getInt(mContext.getContentResolver(), final boolean hideDialogsSet = Settings.Global.getInt(mContext.getContentResolver(),
HIDE_ERROR_DIALOGS, 0) != 0; HIDE_ERROR_DIALOGS, 0) != 0;
mShowDialogs = inputMethodExists mShowDialogs = inputMethodExists
&& ActivityTaskManager.currentUiModeSupportsErrorDialogs(mContext) && ActivityTaskManager.currentUiModeSupportsErrorDialogs(config)
&& !hideDialogsSet; && !hideDialogsSet;
} }