Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2697703a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disabling crash dialogs on TV"

parents 08bbfa94 daab716f

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -19615,7 +19615,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
                                   && 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 && "user".equals(Build.TYPE)));

                && !(modeType == Configuration.UI_MODE_TYPE_WATCH && "user".equals(Build.TYPE))

                && modeType != Configuration.UI_MODE_TYPE_TELEVISION);

        return inputMethodExists && uiModeSupportsDialogs && !inVrMode;

        return inputMethodExists && uiModeSupportsDialogs && !inVrMode;

    }

    }