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

Commit c4f49769 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 

am: c995c632

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

Change-Id: Ia58055d661918bdbd89a418502f5c58ee38500b8
parents 39c20891 c995c632

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

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

    }