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

Commit 824a6b93 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 48c50ccd am: e34fa226

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426648

Change-Id: I0da0bd777346cf53d89be6d4347d3ccef07f9385
parents ddddd7b3 e34fa226

core/java/android/content/pm/ActivityInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
    /** @hide */

    public static final int LOCK_TASK_LAUNCH_MODE_ALWAYS = 2;

    /** @hide */

    public static final int LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED = 3;

    public static final int LOCK_TASK_LAUNCH_MODE_IF_ALLOWLISTED = 3;



    /** @hide */

    public static final String lockTaskLaunchModeToString(int lockTaskLaunchMode) {
@@ -974,8 +974,8 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
                return "LOCK_TASK_LAUNCH_MODE_NEVER";

            case LOCK_TASK_LAUNCH_MODE_ALWAYS:

                return "LOCK_TASK_LAUNCH_MODE_ALWAYS";

            case LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED:

                return "LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED";

            case LOCK_TASK_LAUNCH_MODE_IF_ALLOWLISTED:

                return "LOCK_TASK_LAUNCH_MODE_IF_ALLOWLISTED";

            default:

                return "unknown=" + lockTaskLaunchMode;

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ final class PendingTempWhitelists { 


    void put(int uid, ActivityManagerService.PendingTempWhitelist value) {

        mPendingTempWhitelist.put(uid, value);

        mService.mAtmInternal.onUidAddedToPendingTempWhitelist(uid, value.tag);

        mService.mAtmInternal.onUidAddedToPendingTempAllowlist(uid, value.tag);

    }



    void removeAt(int index) {

        final int uid = mPendingTempWhitelist.keyAt(index);

        mPendingTempWhitelist.removeAt(index);

        mService.mAtmInternal.onUidRemovedFromPendingTempWhitelist(uid);

        mService.mAtmInternal.onUidRemovedFromPendingTempAllowlist(uid);

    }



    ActivityManagerService.PendingTempWhitelist get(int uid) {

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

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TASK; 
import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TOP;

import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_ALWAYS;

import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_DEFAULT;

import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED;

import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_ALLOWLISTED;

import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_NEVER;

import static android.content.pm.ActivityInfo.PERSIST_ACROSS_REBOOTS;

import static android.content.pm.ActivityInfo.PERSIST_ROOT_ONLY;
@@ -1679,7 +1679,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (options != null) {

            final boolean useLockTask = options.getLockTaskMode();

            if (useLockTask && lockTaskLaunchMode == LOCK_TASK_LAUNCH_MODE_DEFAULT) {

                lockTaskLaunchMode = LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED;

                lockTaskLaunchMode = LOCK_TASK_LAUNCH_MODE_IF_ALLOWLISTED;

            }

        }

        return lockTaskLaunchMode;

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

+2 −2
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ import static com.android.server.wm.RootWindowContainer.TAG_STATES; 
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;

import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_PINNED_TASK;

import static com.android.server.wm.Task.LOCK_TASK_AUTH_ALLOWLISTED;

import static com.android.server.wm.Task.LOCK_TASK_AUTH_LAUNCHABLE;

import static com.android.server.wm.Task.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;

import static com.android.server.wm.Task.LOCK_TASK_AUTH_WHITELISTED;

import static com.android.server.wm.Task.REPARENT_KEEP_STACK_AT_FRONT;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
@@ -788,7 +788,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
            final LockTaskController lockTaskController = mService.getLockTaskController();

            if (task.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE

                    || task.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE_PRIV

                    || (task.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED

                    || (task.mLockTaskAuth == LOCK_TASK_AUTH_ALLOWLISTED

                            && lockTaskController.getLockTaskModeState()

                                    == LOCK_TASK_MODE_LOCKED)) {

                lockTaskController.startLockTaskMode(task, false, 0 /* blank UID */);

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

+2 −2
Original line number Diff line number Diff line
@@ -510,8 +510,8 @@ public abstract class ActivityTaskManagerInternal { 
    public abstract void onActiveUidsCleared();

    public abstract void onUidProcStateChanged(int uid, int procState);



    public abstract void onUidAddedToPendingTempWhitelist(int uid, String tag);

    public abstract void onUidRemovedFromPendingTempWhitelist(int uid);

    public abstract void onUidAddedToPendingTempAllowlist(int uid, String tag);

    public abstract void onUidRemovedFromPendingTempAllowlist(int uid);



    /** Handle app crash event in {@link android.app.IActivityController} if there is one. */

    public abstract boolean handleAppCrashInActivityController(String processName, int pid,