From daab716f3515af8def9ac28ce4e71eede4ec8bef Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Fri, 20 Jan 2017 17:53:56 -0800 Subject: [PATCH] Disabling crash dialogs on TV Bug: 34518944 Test: threw an exception and saw the app nicely disappear without a dialog Change-Id: I08ccfe7b34af6e2af6f91fea8750e81955901f40 --- .../java/com/android/server/am/ActivityManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 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 a72950b01dc89..e7e07fe8594b8 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -19615,7 +19615,8 @@ public class ActivityManagerService extends IActivityManager.Stub && 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 && "user".equals(Build.TYPE))); + && !(modeType == Configuration.UI_MODE_TYPE_WATCH && "user".equals(Build.TYPE)) + && modeType != Configuration.UI_MODE_TYPE_TELEVISION); return inputMethodExists && uiModeSupportsDialogs && !inVrMode; }