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

Commit 073879ca authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by android-build-merger
Browse files

Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev 

am: d7b9669b

* commit 'd7b9669b':
  Show crash/ANR dialogs on userdebug watch builds

Change-Id: I74d48e3c6df115d6c2e94d3e4924a17bee6edc66
parents 2ba64166 d7b9669b

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

+1 −1
Original line number Diff line number Diff line
@@ -18581,7 +18581,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 || "eng".equals(Build.TYPE)));

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

        return inputMethodExists && uiModeSupportsDialogs && !inVrMode;

    }