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

Commit 625d65d4 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "Add background protection when work biometrics is shown" into tm-dev... 

Merge "Add background protection when work biometrics is shown" into tm-dev am: ed00c662 am: 8ee98052

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



Change-Id: I5028d5a8c0b38f57e318a2929c01770e04251c9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4acbf915 8ee98052

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(int taskId, int userId);

    void onTaskProfileLocked(in ActivityManager.RunningTaskInfo taskInfo);



    /**

     * Called when a task snapshot got updated.

core/java/android/app/TaskStackListener.java

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 


    @Override

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

    public void onTaskProfileLocked(int taskId, int userId) 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(int taskId, int userId) { }

    default void onTaskProfileLocked(RunningTaskInfo taskInfo) { }



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

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

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



    @Override

    public void onTaskProfileLocked(int taskId, int userId) {

        mMainHandler.obtainMessage(ON_TASK_PROFILE_LOCKED, taskId, userId).sendToTarget();

    public void onTaskProfileLocked(ActivityManager.RunningTaskInfo taskInfo) {

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

    }



    @Override
@@ -341,8 +341,10 @@ public class TaskStackListenerImpl extends TaskStackListener implements Handler. 
                    break;

                }

                case ON_TASK_PROFILE_LOCKED: {

                    final ActivityManager.RunningTaskInfo

                            info = (ActivityManager.RunningTaskInfo) msg.obj;

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

                        mTaskStackListeners.get(i).onTaskProfileLocked(msg.arg1, msg.arg2);

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

                    }

                    break;

                }

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

+4 −3
Original line number Diff line number Diff line
@@ -109,9 +109,10 @@ public class TaskStackListenerImplTest { 


    @Test

    public void testOnTaskProfileLocked() {

        mImpl.onTaskProfileLocked(1, 2);

        verify(mCallback).onTaskProfileLocked(eq(1), eq(2));

        verify(mOtherCallback).onTaskProfileLocked(eq(1), eq(2));

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

        mImpl.onTaskProfileLocked(info);

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

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

    }



    @Test