Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Louis Chang
2021-06-22 00:57:58 +00:00
committed by Android (Google) Code Review
parent c9d806644a 805585ed1b
commit d6be50957e
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -17,6 +17,7 @@
package com.android.server.wm; package com.android.server.wm;
import static android.app.ActivityTaskManager.INVALID_TASK_ID; 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_ASSISTANT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM; import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
@@ -3383,6 +3384,15 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
*/ */
void lockAllProfileTasks(@UserIdInt int userId) { void lockAllProfileTasks(@UserIdInt int userId) {
forAllLeafTasks(task -> { 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) if (task.getActivity(activity -> !activity.finishing && activity.mUserId == userId)
!= null) { != null) {
mService.getTaskChangeNotificationController().notifyTaskProfileLocked( mService.getTaskChangeNotificationController().notifyTaskProfileLocked(

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

@@ -16,6 +16,7 @@
package com.android.server.wm; 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_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
@@ -53,6 +54,7 @@ import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.contains; import static org.mockito.ArgumentMatchers.contains;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.refEq; import static org.mockito.ArgumentMatchers.refEq;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
@@ -1012,12 +1014,26 @@ public class RootWindowContainerTests extends WindowTestsBase {
// Create another activity on top and the user id is 1 // Create another activity on top and the user id is 1
final ActivityRecord topActivity = new ActivityBuilder(mAtm).setTask(task) final ActivityRecord topActivity = new ActivityBuilder(mAtm).setTask(task)
.setUid(UserHandle.PER_USER_RANGE + 1).build(); .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 // Make sure the listeners will be notified for putting the task to locked state
TaskChangeNotificationController controller = mAtm.getTaskChangeNotificationController(); TaskChangeNotificationController controller = mAtm.getTaskChangeNotificationController();
spyOn(controller); spyOn(controller);
mWm.mRoot.lockAllProfileTasks(0); mWm.mRoot.lockAllProfileTasks(0);
verify(controller).notifyTaskProfileLocked(eq(taskId), eq(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());
} }
/** /**