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

Commit ccc66b5c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Merge "Show crash/ANR dialogs on userdebug watch builds" into... 

Merge "Merge "Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev am: d7b9669b" into nyc-mr1-dev-plus-aosp am: 11ac6145"
parents cea2e5e9 03c2856c

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

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

    }