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

Merge "Fix extra configuration change when unlocking directly" into rvc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2020-07-06 20:49:57 +00:00
committed by Android (Google) Code Review
parent e01198edec 332a9410aa
commit 54e3542b96
12 changed files with 78 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -954,8 +954,6 @@ class ActivityStack extends Task {
void awakeFromSleepingLocked() {
// Ensure activities are no longer sleeping.
forAllActivities((Consumer<ActivityRecord>) (r) -> r.setSleeping(false));
ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,
false /* preserveWindows */);
if (mPausingActivity != null) {
Slog.d(TAG, "awakeFromSleepingLocked: previously pausing activity didn't pause");
mPausingActivity.activityPaused(true);

1
services/core/java/com/android/server/wm/DisplayArea.java
View File

@@ -253,6 +253,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
req = mLastKeyguardForcedOrientation;
}
}
mLastOrientationSource = win;
return req;
}
}

19
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -1189,6 +1189,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
activity.onRemovedFromDisplay();
if (activity == mFixedRotationLaunchingApp) {
// Make sure the states of associated tokens are also cleared.
activity.finishFixedRotationTransform();
setFixedRotationLaunchingAppUnchecked(null);
}
}
@@ -1487,6 +1489,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
// window was transferred ({@link #mSkipAppTransitionAnimation}).
return false;
}
if ((mAppTransition.getTransitFlags()
& WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION) != 0) {
// The transition may be finished before keyguard hidden. In order to avoid the
// intermediate orientation change, it is more stable to freeze the display.
return false;
}
} else if (r != topRunningActivity()) {
// If the transition has not started yet, the activity must be the top.
return false;
@@ -2310,6 +2318,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
void onAppTransitionDone() {
super.onAppTransitionDone();
mWmService.mWindowsChanged = true;
// If the transition finished callback cannot match the token for some reason, make sure the
// rotated state is cleared if it is already invisible.
if (mFixedRotationLaunchingApp != null && !mFixedRotationLaunchingApp.mVisibleRequested
&& !mFixedRotationLaunchingApp.isVisible()
&& !mDisplayRotation.isRotatingSeamlessly()) {
clearFixedRotationLaunchingApp();
}
}
@Override
@@ -3011,11 +3026,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
final ScreenRotationAnimation rotationAnimation = getRotationAnimation();
if (rotationAnimation != null) {
pw.print(subPrefix);
pw.println(" mScreenRotationAnimation:");
rotationAnimation.printTo(" ", pw);
rotationAnimation.printTo(subPrefix, pw);
} else if (dumpAll) {
pw.print(subPrefix);
pw.println(" no ScreenRotationAnimation ");
}

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

@@ -2391,6 +2391,12 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
// activity here.
resumeFocusedStacksTopActivities();
}
// The visibility update must not be called before resuming the top, so the
// display orientation can be updated first if needed. Otherwise there may
// have redundant configuration changes due to apply outdated display
// orientation (from keyguard) to activity.
stack.ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,
false /* preserveWindows */);
}
}
}

8
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -1864,14 +1864,14 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
@Override
void dump(PrintWriter pw, String prefix, boolean dumpAll) {
pw.println(prefix + "TaskDisplayArea " + getName());
super.dump(pw, prefix, dumpAll);
final String doublePrefix = prefix + " ";
super.dump(pw, doublePrefix, dumpAll);
if (mPreferredTopFocusableStack != null) {
pw.println(prefix + " mPreferredTopFocusableStack=" + mPreferredTopFocusableStack);
pw.println(doublePrefix + "mPreferredTopFocusableStack=" + mPreferredTopFocusableStack);
}
if (mLastFocusedStack != null) {
pw.println(prefix + " mLastFocusedStack=" + mLastFocusedStack);
pw.println(doublePrefix + "mLastFocusedStack=" + mLastFocusedStack);
}
final String doublePrefix = prefix + " ";
final String triplePrefix = doublePrefix + " ";
pw.println(doublePrefix + "Application tokens in top down Z order:");
for (int stackNdx = getChildCount() - 1; stackNdx >= 0; --stackNdx) {

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

@@ -2555,6 +2555,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
pw.print(prefix); pw.println("ContainerAnimator:");
mSurfaceAnimator.dump(pw, prefix + " ");
}
if (mLastOrientationSource != null) {
pw.println(prefix + "mLastOrientationSource=" + mLastOrientationSource);
}
}
final void updateSurfacePosition() {

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

@@ -127,8 +127,7 @@ public class ActivityRecordTests extends ActivityTestsBase {
mTask = mStack.getBottomMostTask();
mActivity = mTask.getTopNonFinishingActivity();
doReturn(false).when(mService).isBooting();
doReturn(true).when(mService).isBooted();
setBooted(mService);
}
@Test
@@ -1535,7 +1534,7 @@ public class ActivityRecordTests extends ActivityTestsBase {
* Sets orientation without notifying the parent to simulate that the display has not applied
* the requested orientation yet.
*/
private static void setRotatedScreenOrientationSilently(ActivityRecord r) {
static void setRotatedScreenOrientationSilently(ActivityRecord r) {
final int rotatedOrentation = r.getConfiguration().orientation == ORIENTATION_PORTRAIT
? SCREEN_ORIENTATION_LANDSCAPE
: SCREEN_ORIENTATION_PORTRAIT;

3
services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java
View File

@@ -1392,8 +1392,7 @@ public class ActivityStackTests extends ActivityTestsBase {
}
mSupervisor.endDeferResume();
doReturn(false).when(mService).isBooting();
doReturn(true).when(mService).isBooted();
setBooted(mService);
// 2 activities are started while keyguard is locked, so they are waiting to be resolved.
assertFalse(unknownAppVisibilityController.allResolved());

3
services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
View File

@@ -67,8 +67,7 @@ public class ActivityTaskManagerServiceTests extends ActivityTestsBase {
@Before
public void setUp() throws Exception {
doReturn(false).when(mService).isBooting();
doReturn(true).when(mService).isBooted();
setBooted(mService);
}
/** Verify that activity is finished correctly upon request. */

3
services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
View File

@@ -1239,8 +1239,7 @@ public class DisplayContentTests extends WindowTestsBase {
@Test
public void testNoFixedRotationWithPip() {
// Make resume-top really update the activity state.
doReturn(false).when(mWm.mAtmService).isBooting();
doReturn(true).when(mWm.mAtmService).isBooted();
setBooted(mWm.mAtmService);
// Speed up the test by a few seconds.
mWm.mAtmService.deferWindowLayout();
doNothing().when(mWm).startFreezingDisplay(anyInt(), anyInt(), any(), anyInt());

32
services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java
View File

@@ -42,6 +42,7 @@ import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -57,8 +58,10 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.ResolveInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.platform.test.annotations.Presubmit;
import android.util.MergedConfiguration;
import android.util.Pair;
import androidx.test.filters.MediumTest;
@@ -221,6 +224,35 @@ public class RootActivityContainerTests extends ActivityTestsBase {
null /* target */, null /* targetOptions */);
}
@Test
public void testAwakeFromSleepingWithAppConfiguration() {
final DisplayContent display = mRootWindowContainer.getDefaultDisplay();
final ActivityRecord activity = new ActivityBuilder(mService).setCreateTask(true).build();
activity.moveFocusableActivityToTop("test");
assertTrue(activity.getStack().isFocusedStackOnDisplay());
ActivityRecordTests.setRotatedScreenOrientationSilently(activity);
final Configuration rotatedConfig = new Configuration();
display.computeScreenConfiguration(rotatedConfig, display.getDisplayRotation()
.rotationForOrientation(activity.getOrientation(), display.getRotation()));
assertNotEquals(activity.getConfiguration().orientation, rotatedConfig.orientation);
// Assume the activity was shown in different orientation. For example, the top activity is
// landscape and the portrait lockscreen is shown.
activity.setLastReportedConfiguration(
new MergedConfiguration(mService.getGlobalConfiguration(), rotatedConfig));
activity.setState(ActivityState.STOPPED, "sleep");
display.setIsSleeping(true);
doReturn(false).when(display).shouldSleep();
// Allow to resume when awaking.
setBooted(mService);
mRootWindowContainer.applySleepTokens(true);
// The display orientation should be changed by the activity so there is no relaunch.
verify(activity, never()).relaunchActivityLocked(anyBoolean());
assertEquals(rotatedConfig.orientation, display.getConfiguration().orientation);
}
/**
* Verifies that removal of activity with task and stack is done correctly.
*/

11
services/tests/wmtests/src/com/android/server/wm/SystemServiceTestsBase.java
View File

@@ -16,6 +16,8 @@
package com.android.server.wm;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import android.os.Handler;
import android.testing.DexmakerShareClassLoaderRule;
@@ -66,6 +68,15 @@ class SystemServiceTestsBase {
return mLockRule.waitForLocked(callable);
}
/**
* Make the system booted, so that {@link ActivityStack#resumeTopActivityInnerLocked} can really
* be executed to update activity state and configuration when resuming the current top.
*/
static void setBooted(ActivityTaskManagerService atmService) {
doReturn(false).when(atmService).isBooting();
doReturn(true).when(atmService).isBooted();
}
/**
* Utility class to compare the output of T#toString. It is convenient to have readable output
* of assertion if the string content can represent the expected states.