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

Commit a905bf51 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11681105 from 2e58e2d9 to 24Q3-release 

Change-Id: I8b67293fa12456c3bd2f49434a81c3b2dc795786
parents a995686c 2e58e2d9

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java

+19 −19
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ public class UserLifecycleTests { 
            mRunner.pauseTiming();

            Log.i(TAG, "Stopping timer");



            stopUser(userId, /* force */true);

            stopUser(userId);

            mRunner.resumeTimingForNextIteration();

        }
@@ -429,7 +429,7 @@ public class UserLifecycleTests { 


            mRunner.pauseTiming();

            Log.i(TAG, "Stopping timer");

            stopUser(userId, /* force */true);

            stopUser(userId);

            mRunner.resumeTimingForNextIteration();

        }
@@ -545,7 +545,7 @@ public class UserLifecycleTests { 
            mRunner.pauseTiming();

            Log.d(TAG, "Stopping timer");

            switchUserNoCheck(currentUserId);

            stopUserAfterWaitingForBroadcastIdle(userId, /* force */true);

            stopUserAfterWaitingForBroadcastIdle(userId);

            attestFalse("Failed to stop user " + userId, mAm.isUserRunning(userId));

            mRunner.resumeTimingForNextIteration();

        }
@@ -571,7 +571,7 @@ public class UserLifecycleTests { 
            mRunner.pauseTiming();

            Log.d(TAG, "Stopping timer");

            switchUserNoCheck(startUser);

            stopUserAfterWaitingForBroadcastIdle(testUser, true);

            stopUserAfterWaitingForBroadcastIdle(testUser);

            attestFalse("Failed to stop user " + testUser, mAm.isUserRunning(testUser));

            mRunner.resumeTimingForNextIteration();

        }
@@ -660,7 +660,7 @@ public class UserLifecycleTests { 
            mRunner.resumeTiming();

            Log.i(TAG, "Starting timer");



            stopUser(userId, false);

            stopUser(userId);



            mRunner.pauseTiming();

            Log.i(TAG, "Stopping timer");
@@ -685,7 +685,7 @@ public class UserLifecycleTests { 
            Log.d(TAG, "Starting timer");

            mRunner.resumeTiming();



            stopUser(userId, false);

            stopUser(userId);



            mRunner.pauseTiming();

            Log.d(TAG, "Stopping timer");
@@ -883,7 +883,7 @@ public class UserLifecycleTests { 
            final int userId = createManagedProfile();

            // Start the profile initially, then stop it. Similar to setQuietModeEnabled.

            startUserInBackgroundAndWaitForUnlock(userId);

            stopUserAfterWaitingForBroadcastIdle(userId, true);

            stopUserAfterWaitingForBroadcastIdle(userId);

            mRunner.resumeTiming();

            Log.i(TAG, "Starting timer");
@@ -905,7 +905,7 @@ public class UserLifecycleTests { 
        startUserInBackgroundAndWaitForUnlock(userId);

        while (mRunner.keepRunning()) {

            mRunner.pauseTiming();

            stopUserAfterWaitingForBroadcastIdle(userId, true);

            stopUserAfterWaitingForBroadcastIdle(userId);

            mRunner.resumeTiming();

            Log.d(TAG, "Starting timer");
@@ -987,7 +987,7 @@ public class UserLifecycleTests { 
            installPreexistingApp(userId, DUMMY_PACKAGE_NAME);

            startUserInBackgroundAndWaitForUnlock(userId);

            startApp(userId, DUMMY_PACKAGE_NAME);

            stopUserAfterWaitingForBroadcastIdle(userId, true);

            stopUserAfterWaitingForBroadcastIdle(userId);

            SystemClock.sleep(1_000); // 1 second cool-down before re-starting profile.

            mRunner.resumeTiming();

            Log.i(TAG, "Starting timer");
@@ -1019,7 +1019,7 @@ public class UserLifecycleTests { 
            installPreexistingApp(userId, DUMMY_PACKAGE_NAME);

            startUserInBackgroundAndWaitForUnlock(userId);

            startApp(userId, DUMMY_PACKAGE_NAME);

            stopUserAfterWaitingForBroadcastIdle(userId, true);

            stopUserAfterWaitingForBroadcastIdle(userId);

            SystemClock.sleep(1_000); // 1 second cool-down before re-starting profile.

            mRunner.resumeTiming();

            Log.d(TAG, "Starting timer");
@@ -1144,7 +1144,7 @@ public class UserLifecycleTests { 
            mRunner.resumeTiming();

            Log.i(TAG, "Starting timer");



            stopUser(userId, true);

            stopUser(userId);



            mRunner.pauseTiming();

            Log.i(TAG, "Stopping timer");
@@ -1168,7 +1168,7 @@ public class UserLifecycleTests { 
            mRunner.resumeTiming();

            Log.d(TAG, "Starting timer");



            stopUser(userId, true);

            stopUser(userId);



            mRunner.pauseTiming();

            Log.d(TAG, "Stopping timer");
@@ -1294,15 +1294,15 @@ public class UserLifecycleTests { 
     * Do not call this method while timing is on. i.e. between mRunner.resumeTiming() and

     * mRunner.pauseTiming(). Otherwise it would cause the test results to be spiky.

     */

    private void stopUserAfterWaitingForBroadcastIdle(int userId, boolean force)

    private void stopUserAfterWaitingForBroadcastIdle(int userId)

            throws RemoteException {

        waitForBroadcastIdle();

        stopUser(userId, force);

        stopUser(userId);

    }



    private void stopUser(int userId, boolean force) throws RemoteException {

    private void stopUser(int userId) throws RemoteException {

        final CountDownLatch latch = new CountDownLatch(1);

        mIam.stopUser(userId, force /* force */, new IStopUserCallback.Stub() {

        mIam.stopUserWithCallback(userId, new IStopUserCallback.Stub() {

            @Override

            public void userStopped(int userId) throws RemoteException {

                latch.countDown();
@@ -1352,7 +1352,7 @@ public class UserLifecycleTests { 
        attestTrue("Didn't switch back to user, " + origUser, origUser == mAm.getCurrentUser());



        if (stopNewUser) {

            stopUserAfterWaitingForBroadcastIdle(testUser, true);

            stopUserAfterWaitingForBroadcastIdle(testUser);

            attestFalse("Failed to stop user " + testUser, mAm.isUserRunning(testUser));

        }
@@ -1471,7 +1471,7 @@ public class UserLifecycleTests { 
    }



    private void removeUser(int userId) throws RemoteException {

        stopUserAfterWaitingForBroadcastIdle(userId, true);

        stopUserAfterWaitingForBroadcastIdle(userId);

        try {

            ShellHelper.runShellCommandWithTimeout("pm remove-user -w " + userId,

                    TIMEOUT_IN_SECOND);
@@ -1512,7 +1512,7 @@ public class UserLifecycleTests { 


            final boolean preStartComplete = mIam.startUserInBackgroundWithListener(userId,

                    preWaiter) && preWaiter.waitForFinish(TIMEOUT_IN_SECOND * 1000);

            stopUserAfterWaitingForBroadcastIdle(userId, /* force */true);

            stopUserAfterWaitingForBroadcastIdle(userId);



            assertTrue("Pre start was not performed for user" + userId, preStartComplete);

        }

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void setStopUserOnSwitch(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean startUserInBackgroundVisibleOnDisplay(int, int);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean stopUser(int, boolean);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean stopUser(int);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void unregisterUidFrozenStateChangedCallback(@NonNull android.app.ActivityManager.UidFrozenStateChangedCallback);

    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();

core/java/android/app/ActivityManager.java

+5 −4
Original line number Diff line number Diff line
@@ -5071,7 +5071,7 @@ public class ActivityManager { 
     * <p><b>NOTE:</b> differently from {@link #switchUser(int)}, which stops the current foreground

     * user before starting a new one, this method does not stop the previous user running in

     * background in the display, and it will return {@code false} in this case. It's up to the

     * caller to call {@link #stopUser(int, boolean)} before starting a new user.

     * caller to call {@link #stopUser(int)} before starting a new user.

     *

     * @param userId user to be started in the display. It will return {@code false} if the user is

     * a profile, the {@link #getCurrentUser()}, the {@link UserHandle#SYSTEM system user}, or
@@ -5281,15 +5281,16 @@ public class ActivityManager { 
     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    public boolean stopUser(@UserIdInt int userId, boolean force) {

    public boolean stopUser(@UserIdInt int userId) {

        if (userId == UserHandle.USER_SYSTEM) {

            return false;

        }

        try {

            return USER_OP_SUCCESS == getService().stopUser(

                    userId, force, /* callback= */ null);

            return USER_OP_SUCCESS == getService().stopUserWithCallback(

                    userId, /* callback= */ null);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/app/ActivityOptions.java

+0 −13
Original line number Diff line number Diff line
@@ -2204,19 +2204,6 @@ public class ActivityOptions extends ComponentOptions { 
        return mDismissKeyguardIfInsecure;

    }



    /**

     * Sets background activity launch logic won't use pending intent creator foreground state.

     *

     * @hide

     * @deprecated use {@link #setPendingIntentCreatorBackgroundActivityStartMode(int)} instead

     */

    @Deprecated

    public ActivityOptions setIgnorePendingIntentCreatorForegroundState(boolean ignore) {

        mPendingIntentCreatorBackgroundActivityStartMode = ignore

                ? MODE_BACKGROUND_ACTIVITY_START_DENIED : MODE_BACKGROUND_ACTIVITY_START_ALLOWED;

        return this;

    }



    /**

     * Allow a {@link PendingIntent} to use the privilege of its creator to start background

     * activities.

core/java/android/app/IActivityManager.aidl

+6 −3
Original line number Diff line number Diff line
@@ -452,12 +452,14 @@ interface IActivityManager { 
            in IBinder resultTo, in String resultWho, int requestCode, int flags,

            in ProfilerInfo profilerInfo, in Bundle options, int userId);

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    int stopUser(int userid, boolean force, in IStopUserCallback callback);

    int stopUser(int userid, boolean stopProfileRegardlessOfParent, in IStopUserCallback callback);

    int stopUserWithCallback(int userid, in IStopUserCallback callback);

    int stopUserExceptCertainProfiles(int userid, boolean stopProfileRegardlessOfParent, in IStopUserCallback callback);

    /**

     * Check {@link com.android.server.am.ActivityManagerService#stopUserWithDelayedLocking(int, boolean, IStopUserCallback)}

     * Check {@link com.android.server.am.ActivityManagerService#stopUserWithDelayedLocking(int, IStopUserCallback)}

     * for details.

     */

    int stopUserWithDelayedLocking(int userid, boolean force, in IStopUserCallback callback);

    int stopUserWithDelayedLocking(int userid, in IStopUserCallback callback);



    @UnsupportedAppUsage

    void registerUserSwitchObserver(in IUserSwitchObserver observer, in String name);
@@ -499,6 +501,7 @@ interface IActivityManager { 
            in String shareDescription);



    void requestInteractiveBugReport();

    void requestBugReportWithExtraAttachment(in Uri extraAttachment);

    void requestFullBugReport();

    void requestRemoteBugReport(long nonce);

    boolean launchBugReportHandlerApp();