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

Commit 741c0a78 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge changes from topic "sep11" am: c0b28813 am: 69e6f073 

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

Change-Id: I7da537200efe31e803234bd1a0236843064186c8
parents 1d3e694b 69e6f073

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
    }



    /**

     * Returns a set of whitelisted accounts given by the intent or null if none specified by the

     * Returns a set of allowlisted accounts given by the intent or null if none specified by the

     * intent.

     */

    private Set<Account> getAllowableAccountSet(final Intent intent) {

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -8348,7 +8348,7 @@ public class Activity extends ContextThemeWrapper 
     *

     * <p>If {@link DevicePolicyManager#isLockTaskPermitted(String)} returns {@code true}

     * for this component, the current task will be launched directly into LockTask mode. Only apps

     * whitelisted by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])} can

     * allowlisted by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])} can

     * be launched while LockTask mode is active. The user will not be able to leave this mode

     * until this activity calls {@link #stopLockTask()}. Calling this method while the device is

     * already in LockTask mode has no effect.
@@ -8380,7 +8380,7 @@ public class Activity extends ContextThemeWrapper 
     * <p><strong>Note:</strong> If the device is in LockTask mode that is not initially started

     * by this activity, then calling this method will not terminate the LockTask mode, but only

     * finish its own task. The device will remain in LockTask mode, until the activity which

     * started the LockTask mode calls this method, or until its whitelist authorization is revoked

     * started the LockTask mode calls this method, or until its allowlist authorization is revoked

     * by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])}.

     *

     * @see #startLockTask()

core/java/android/app/ActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -4875,9 +4875,9 @@ public class ActivityManager { 
    }



    /**

     * Get packages of bugreport-whitelisted apps to handle a bug report.

     * Get packages of bugreport-allowlisted apps to handle a bug report.

     *

     * @return packages of bugreport-whitelisted apps to handle a bug report.

     * @return packages of bugreport-allowlisted apps to handle a bug report.

     * @hide

     */

    public List<String> getBugreportWhitelistedPackages() {

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -4053,7 +4053,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
    private void handleCreateBackupAgent(CreateBackupAgentData data) {

        if (DEBUG_BACKUP) Slog.v(TAG, "handleCreateBackupAgent: " + data);



        // Sanity check the requested target package's uid against ours

        // Validity check the requested target package's uid against ours

        try {

            PackageInfo requestedPackage = getPackageManager().getPackageInfo(

                    data.appInfo.packageName, 0, UserHandle.myUserId());

core/java/android/app/ActivityView.java

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
        }

        mSurfaceView = new SurfaceView(context, null, 0, 0, disableSurfaceViewBackgroundLayer);

        // Since ActivityView#getAlpha has been overridden, we should use parent class's alpha

        // as master to synchronize surface view's alpha value.

        // as authoritative to synchronize surface view's alpha value.

        mSurfaceView.setAlpha(super.getAlpha());

        mSurfaceView.setUseAlpha();

        mSurfaceCallback = new SurfaceCallback();