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

Merge "Set pending top and update process state for top resumed change" into sc-v2-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-11-05 03:26:06 +00:00
committed by Android (Google) Code Review
parent c6b8df839e 6a99e77686
commit a5d5b319e6
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2049,6 +2049,16 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
// Update the current top activity.
mTopResumedActivity = topRootTask.getTopResumedActivity();
// Update process state if there is no activity state change (e.g. focus change between
// multi-window mode activities) to make sure that the current top has top oom-adj.
// If the previous top is null, there should be activity state change from it, Then the
// process state should also have been updated so no need to update again.
if (mTopResumedActivity != null && prevTopActivity != null) {
if (mTopResumedActivity.app != null) {
mTopResumedActivity.app.addToPendingTop();
}
mService.updateOomAdj();
}
scheduleTopResumedActivityStateIfNeeded();
mService.updateTopApp(mTopResumedActivity);

7
services/core/java/com/android/server/wm/WindowProcessController.java
View File

@@ -1110,7 +1110,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
void updateProcessInfo(boolean updateServiceConnectionActivities, boolean activityChange,
boolean updateOomAdj, boolean addPendingTopUid) {
if (addPendingTopUid) {
mAtm.mAmInternal.addPendingTopUid(mUid, mPid);
addToPendingTop();
}
if (updateOomAdj) {
prepareOomAdjustment();
@@ -1121,6 +1121,11 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
mAtm.mH.sendMessage(m);
}
/** Makes the process have top state before oom-adj is computed from a posted message. */
void addToPendingTop() {
mAtm.mAmInternal.addPendingTopUid(mUid, mPid);
}
void updateServiceConnectionActivities() {
// Posting on handler so WM lock isn't held when we call into AM.
mAtm.mH.sendMessage(PooledLambda.obtainMessage(

26
services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java
View File

@@ -19,6 +19,7 @@ package com.android.server.wm;
import static android.app.ActivityManager.START_DELIVERED_TO_TOP;
import static android.app.ActivityManager.START_TASK_TO_FRONT;
import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SECONDARY_DISPLAY;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.never;
@@ -36,6 +37,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.timeout;
@@ -265,6 +267,30 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
assertThat(allowedOnUntrusted).isFalse();
}
/**
* Verifies that process state will be updated with pending top without activity state change.
* E.g. switch focus between resumed activities in multi-window mode.
*/
@Test
public void testUpdatePendingTopForTopResumed() {
final Task task1 = new TaskBuilder(mSupervisor)
.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW).build();
final ActivityRecord activity1 = new ActivityBuilder(mAtm)
.setTask(task1).setUid(ActivityBuilder.DEFAULT_FAKE_UID + 1).build();
task1.setResumedActivity(activity1, "test");
final ActivityRecord activity2 = new TaskBuilder(mSupervisor)
.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW)
.setCreateActivity(true).build().getTopMostActivity();
activity2.getTask().setResumedActivity(activity2, "test");
mAtm.mAmInternal.deletePendingTopUid(activity1.getUid());
clearInvocations(mAtm);
activity1.moveFocusableActivityToTop("test");
assertTrue(mAtm.mAmInternal.isPendingTopUid(activity1.getUid()));
verify(mAtm).updateOomAdj();
}
/**
* We need to launch home again after user unlocked for those displays that do not have
* encryption aware home app.