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

Merge "Update activity visibility for all users"

Browse Source
This commit is contained in:
Louis Chang
2022-02-10 09:47:25 +00:00
committed by Android (Google) Code Review
parent d25198a25e 3f7b02d826
commit 903315ba69
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
View File

@@ -104,7 +104,8 @@ class EnsureActivitiesVisibleHelper {
for (int i = mTaskFragment.mChildren.size() - 1; i >= 0; --i) {
final WindowContainer child = mTaskFragment.mChildren.get(i);
final TaskFragment childTaskFragment = child.asTaskFragment();
if (childTaskFragment != null && childTaskFragment.topRunningActivity() != null) {
if (childTaskFragment != null
&& childTaskFragment.getTopNonFinishingActivity() != null) {
childTaskFragment.updateActivityVisibilities(starting, configChanges,
preserveWindows, notifyClients);
mBehindFullyOccludedContainer |=

24
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
View File

@@ -121,6 +121,7 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
import android.os.PersistableBundle;
@@ -3358,6 +3359,29 @@ public class ActivityRecordTests extends WindowTestsBase {
noProcActivity.mInputDispatchingTimeoutMillis);
}
@Test
public void testEnsureActivitiesVisibleAnotherUserTasks() {
// Create an activity with hierarchy:
// RootTask
// - TaskFragment
// - Activity
DisplayContent display = createNewDisplay();
Task rootTask = createTask(display);
ActivityRecord activity = createActivityRecord(rootTask);
final TaskFragment taskFragment = new TaskFragment(mAtm, new Binder(),
true /* createdByOrganizer */, true /* isEmbedded */);
activity.getTask().addChild(taskFragment, POSITION_TOP);
activity.reparent(taskFragment, POSITION_TOP);
// Ensure the activity visibility is updated even it is not shown to current user.
activity.mVisibleRequested = true;
doReturn(false).when(activity).showToCurrentUser();
spyOn(taskFragment);
doReturn(false).when(taskFragment).shouldBeVisible(any());
display.ensureActivitiesVisible(null, 0, false, false);
assertFalse(activity.mVisibleRequested);
}
private ICompatCameraControlCallback getCompatCameraControlCallback() {
return new ICompatCameraControlCallback.Stub() {
@Override