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

Commit c995c632 authored by Michael Kwan's avatar Michael Kwan Committed by android-build-merger
Browse files

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

am: 0092f82d

* commit '0092f82d':
  Allow ANR dialogs for Watch eng builds.

Change-Id: I3182845d80bacb426363b9245ee49390846d9c15
parents 47ad7299 0092f82d

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;

    }