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

Commit 5420b61a authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Avoid locking profile task when it is already lock" into sc-dev am:... 

Merge "Avoid locking profile task when it is already lock" into sc-dev am: d6be5095 am: 65660261

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

Change-Id: I9a5bd28b563e8b8134d068aa5551dbae44e108a5
parents ec099d8e 65660261

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

+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm;



import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.KeyguardManager.ACTION_CONFIRM_DEVICE_CREDENTIAL_WITH_USER;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
@@ -3386,6 +3387,15 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
     */

    void lockAllProfileTasks(@UserIdInt int userId) {

        forAllLeafTasks(task -> {

            final ActivityRecord top = task.topRunningActivity();

            if (top != null && !top.finishing

                    && ACTION_CONFIRM_DEVICE_CREDENTIAL_WITH_USER.equals(top.intent.getAction())

                    && top.packageName.equals(

                            mService.getSysUiServiceComponentLocked().getPackageName())) {

                // Do nothing since the task is already secure by sysui.

                return;

            }



            if (task.getActivity(activity -> !activity.finishing && activity.mUserId == userId)

                    != null) {

                mService.getTaskChangeNotificationController().notifyTaskProfileLocked(

services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm;



import static android.app.KeyguardManager.ACTION_CONFIRM_DEVICE_CREDENTIAL_WITH_USER;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
@@ -54,6 +55,7 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.ArgumentMatchers.contains;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.refEq;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;
@@ -1013,12 +1015,26 @@ public class RootWindowContainerTests extends WindowTestsBase { 
        // Create another activity on top and the user id is 1

        final ActivityRecord topActivity = new ActivityBuilder(mAtm).setTask(task)

                .setUid(UserHandle.PER_USER_RANGE + 1).build();

        doReturn(true).when(topActivity).okToShowLocked();

        topActivity.intent.setAction(Intent.ACTION_MAIN);



        // Make sure the listeners will be notified for putting the task to locked state

        TaskChangeNotificationController controller = mAtm.getTaskChangeNotificationController();

        spyOn(controller);

        mWm.mRoot.lockAllProfileTasks(0);

        verify(controller).notifyTaskProfileLocked(eq(taskId), eq(0));



        // Create the work lock activity on top of the task

        final ActivityRecord workLockActivity = new ActivityBuilder(mAtm).setTask(task)

                .setUid(UserHandle.PER_USER_RANGE + 1).build();

        doReturn(true).when(workLockActivity).okToShowLocked();

        workLockActivity.intent.setAction(ACTION_CONFIRM_DEVICE_CREDENTIAL_WITH_USER);

        doReturn(workLockActivity.mActivityComponent).when(mAtm).getSysUiServiceComponentLocked();



        // Make sure the listener won't be notified again.

        clearInvocations(controller);

        mWm.mRoot.lockAllProfileTasks(0);

        verify(controller, never()).notifyTaskProfileLocked(anyInt(), anyInt());

    }



    /**