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

Commit 25f27abe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add currentUiModeSupportsErrorDialogs() into ActivityTaskManager." into... 

Merge "Add currentUiModeSupportsErrorDialogs() into ActivityTaskManager." into rvc-dev am: 6b74050d am: c92f564c am: 995ba093

Change-Id: Ie3e095b7b36c4aeeeae5c3da36825ae7b94cf4e0
parents fd5f75e1 995ba093

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ package android.app { 


  public class ActivityTaskManager {

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void clearLaunchParamsForPackages(java.util.List<java.lang.String>);

    method public static boolean currentUiModeSupportsErrorDialogs(@NonNull android.content.Context);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public String listAllStacks();

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void moveTaskToStack(int, int, boolean);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean moveTopActivityToPinnedStack(int, android.graphics.Rect);

core/java/android/app/ActivityTaskManager.java

+12 −0
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ import android.annotation.TestApi; 
import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Rect;

import android.os.Build;

import android.os.Handler;

import android.os.IBinder;

import android.os.RemoteException;
@@ -430,4 +432,14 @@ public class ActivityTaskManager { 
            throw e.rethrowFromSystemServer();

        }

    }



    /** Returns whether the current UI mode supports error dialogs (ANR, crash, etc). */

    public static boolean currentUiModeSupportsErrorDialogs(@NonNull Context context) {

        final Configuration config = context.getResources().getConfiguration();

        int modeType = config.uiMode & Configuration.UI_MODE_TYPE_MASK;

        return (modeType != Configuration.UI_MODE_TYPE_CAR

                && !(modeType == Configuration.UI_MODE_TYPE_WATCH && Build.IS_USER)

                && modeType != Configuration.UI_MODE_TYPE_TELEVISION

                && modeType != Configuration.UI_MODE_TYPE_VR_HEADSET);

    }

}

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+3 −6
Original line number Diff line number Diff line
@@ -5400,14 +5400,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        final boolean inputMethodExists = !(config.keyboard == Configuration.KEYBOARD_NOKEYS

                && config.touchscreen == Configuration.TOUCHSCREEN_NOTOUCH

                && 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 && Build.IS_USER)

                && modeType != Configuration.UI_MODE_TYPE_TELEVISION

                && modeType != Configuration.UI_MODE_TYPE_VR_HEADSET);

        final boolean hideDialogsSet = Settings.Global.getInt(mContext.getContentResolver(),

                HIDE_ERROR_DIALOGS, 0) != 0;

        mShowDialogs = inputMethodExists && uiModeSupportsDialogs && !hideDialogsSet;

        mShowDialogs = inputMethodExists

                && ActivityTaskManager.currentUiModeSupportsErrorDialogs(mContext)

                && !hideDialogsSet;

    }



    private void updateFontScaleIfNeeded(@UserIdInt int userId) {