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

Commit 0092f82d authored by Michael Kwan's avatar Michael Kwan Committed by Android (Google) Code Review
Browse files

Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev

parents 6c8767fe 09c3f2d0

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

+1 −1
Original line number Diff line number Diff line
@@ -18342,7 +18342,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);

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

        return inputMethodExists && uiModeSupportsDialogs && !inVrMode;

    }