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

Commit 10604e78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Pass profile userId to notifyLockedProfile" into udc-dev am: 7e005c88 

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



Change-Id: I4f5337e7e657699927a59dc6f4d08cc4164408f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ecf1633 7e005c88

core/java/android/app/ITaskStackListener.aidl

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ oneway interface ITaskStackListener { 
     * activities inside it belong to a managed profile user, and that user has just

     * been locked.

     */

    void onTaskProfileLocked(in ActivityManager.RunningTaskInfo taskInfo);

    void onTaskProfileLocked(in ActivityManager.RunningTaskInfo taskInfo, int userId);



    /**

     * Called when a task snapshot got updated.

core/java/android/app/TaskStackListener.java

+11 −1
Original line number Diff line number Diff line
@@ -154,8 +154,18 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    }



    @Override

    public void onTaskProfileLocked(RunningTaskInfo taskInfo, int userId)

            throws RemoteException {

        onTaskProfileLocked(taskInfo);

    }



    /**

     * @deprecated see {@link #onTaskProfileLocked(RunningTaskInfo, int)}

     */

    @Deprecated

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public void onTaskProfileLocked(RunningTaskInfo taskInfo) throws RemoteException {

    public void onTaskProfileLocked(RunningTaskInfo taskInfo)

            throws RemoteException {

    }



    @Override

libs/WindowManager/Shell/src/com/android/wm/shell/common/TaskStackListenerCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public interface TaskStackListenerCallback { 


    default void onTaskStackChanged() { }



    default void onTaskProfileLocked(RunningTaskInfo taskInfo) { }

    default void onTaskProfileLocked(RunningTaskInfo taskInfo, int userId) { }



    default void onTaskDisplayChanged(int taskId, int newDisplayId) { }

libs/WindowManager/Shell/src/com/android/wm/shell/common/TaskStackListenerImpl.java

+4 −3
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ public class TaskStackListenerImpl extends TaskStackListener implements Handler. 
    }



    @Override

    public void onTaskProfileLocked(ActivityManager.RunningTaskInfo taskInfo) {

        mMainHandler.obtainMessage(ON_TASK_PROFILE_LOCKED, taskInfo).sendToTarget();

    public void onTaskProfileLocked(ActivityManager.RunningTaskInfo taskInfo, int userId) {

        mMainHandler.obtainMessage(ON_TASK_PROFILE_LOCKED, userId, 0, taskInfo).sendToTarget();

    }



    @Override
@@ -348,8 +348,9 @@ public class TaskStackListenerImpl extends TaskStackListener implements Handler. 
                case ON_TASK_PROFILE_LOCKED: {

                    final ActivityManager.RunningTaskInfo

                            info = (ActivityManager.RunningTaskInfo) msg.obj;

                    final int userId = msg.arg1;

                    for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) {

                        mTaskStackListeners.get(i).onTaskProfileLocked(info);

                        mTaskStackListeners.get(i).onTaskProfileLocked(info, userId);

                    }

                    break;

                }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/TaskStackListenerImplTest.java

+3 −3
Original line number Diff line number Diff line
@@ -112,9 +112,9 @@ public class TaskStackListenerImplTest extends ShellTestCase { 
    @Test

    public void testOnTaskProfileLocked() {

        ActivityManager.RunningTaskInfo info = mock(ActivityManager.RunningTaskInfo.class);

        mImpl.onTaskProfileLocked(info);

        verify(mCallback).onTaskProfileLocked(eq(info));

        verify(mOtherCallback).onTaskProfileLocked(eq(info));

        mImpl.onTaskProfileLocked(info, 0);

        verify(mCallback).onTaskProfileLocked(eq(info), eq(0));

        verify(mOtherCallback).onTaskProfileLocked(eq(info), eq(0));

    }



    @Test