Merge "Fix typo of field in DisplayContent" (95870ec6) · Commits · e / os / android_frameworks_base

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		private final int mDisplayId;

		// TODO: Remove once unification is complete.
		ActivityDisplay mAcitvityDisplay;
		ActivityDisplay mActivityDisplay;

		/** The containers below are the only child containers the display can have. */
		// Contains all window containers that are related to apps (Activities)
		@@ -852,7 +852,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		DisplayContent(Display display, WindowManagerService service,
		ActivityDisplay activityDisplay) {
		super(service);
		mAcitvityDisplay = activityDisplay;
		mActivityDisplay = activityDisplay;
		if (service.mRoot.getDisplayContent(display.getDisplayId()) != null) {
		throw new IllegalArgumentException("Display with ID=" + display.getDisplayId()
		+ " already exists=" + service.mRoot.getDisplayContent(display.getDisplayId())
		@@ -1136,8 +1136,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		* values from being replaced by the initializing {@link #ActivityDisplay}.
		*/
		void initializeDisplayOverrideConfiguration() {
		if (mAcitvityDisplay != null) {
		mAcitvityDisplay.getRequestedOverrideConfiguration()
		if (mActivityDisplay != null) {
		mActivityDisplay.getRequestedOverrideConfiguration()
		.updateFrom(getRequestedOverrideConfiguration());
		}
		}
		@@ -1165,10 +1165,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		}

		void sendNewConfiguration() {
		if (!isReady() \|\| mAcitvityDisplay == null) {
		if (!isReady() \|\| mActivityDisplay == null) {
		return;
		}
		final boolean configUpdated = mAcitvityDisplay.updateDisplayOverrideConfigurationLocked();
		final boolean configUpdated = mActivityDisplay.updateDisplayOverrideConfigurationLocked();
		if (configUpdated) {
		return;
		}
		@@ -1199,7 +1199,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo

		if (handled && requestingContainer instanceof ActivityRecord) {
		final ActivityRecord activityRecord = (ActivityRecord) requestingContainer;
		final boolean kept = mAcitvityDisplay.updateDisplayOverrideConfigurationLocked(
		final boolean kept = mActivityDisplay.updateDisplayOverrideConfigurationLocked(
		config, activityRecord, false /* deferResume /, null / result */);
		activityRecord.frozenBeforeDestroy = true;
		if (!kept) {
		@@ -1208,7 +1208,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		} else {
		// We have a new configuration to push so we need to update ATMS for now.
		// TODO: Clean up display configuration push between ATMS and WMS after unification.
		mAcitvityDisplay.updateDisplayOverrideConfigurationLocked(
		mActivityDisplay.updateDisplayOverrideConfigurationLocked(
		config, null /* starting /, false / deferResume */, null);
		}
		return handled;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -652,9 +652,9 @@ class RootActivityContainer extends ConfigurationContainer
		starting.frozenBeforeDestroy = true;
		}

		if (displayContent != null && displayContent.mAcitvityDisplay != null) {
		if (displayContent != null && displayContent.mActivityDisplay != null) {
		// Update the configuration of the activities on the display.
		return displayContent.mAcitvityDisplay.updateDisplayOverrideConfigurationLocked(config,
		return displayContent.mActivityDisplay.updateDisplayOverrideConfigurationLocked(config,
		starting, deferResume, null /* result */);
		} else {
		return true;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		final DisplayContent existing = getDisplayContent(displayId);

		if (existing != null) {
		existing.mAcitvityDisplay = activityDisplay;
		existing.mActivityDisplay = activityDisplay;
		existing.initializeDisplayOverrideConfiguration();
		return existing;
		}
		@@ -1067,7 +1067,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		void positionChildAt(int position, DisplayContent child, boolean includingParents) {
		super.positionChildAt(position, child, includingParents);
		if (mRootActivityContainer != null) {
		mRootActivityContainer.onChildPositionChanged(child.mAcitvityDisplay, position);
		mRootActivityContainer.onChildPositionChanged(child.mActivityDisplay, position);
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -7636,7 +7636,7 @@ public class WindowManagerService extends IWindowManager.Stub
		// to do so because it seems possible to resume activities as part of a larger
		// transaction and it's too early to resume based on current order when performing
		// updateTopResumedActivityIfNeeded().
		displayContent.mAcitvityDisplay.ensureActivitiesVisible(null /* starting */,
		displayContent.mActivityDisplay.ensureActivitiesVisible(null /* starting */,
		0 /* configChanges /, !PRESERVE_WINDOWS, true / notifyClients */);
		}
		}

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -706,13 +706,13 @@ public class DisplayContentTests extends WindowTestsBase {

		final ActivityStack stack =
		new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootActivityContainer)
		.setDisplay(dc.mAcitvityDisplay).build();
		.setDisplay(dc.mActivityDisplay).build();
		final ActivityRecord activity = stack.topTask().getTopActivity();

		activity.setRequestedOrientation(newOrientation);

		final ArgumentCaptor<Configuration> captor = ArgumentCaptor.forClass(Configuration.class);
		verify(dc.mAcitvityDisplay).updateDisplayOverrideConfigurationLocked(captor.capture(),
		verify(dc.mActivityDisplay).updateDisplayOverrideConfigurationLocked(captor.capture(),
		same(activity), anyBoolean(), same(null));
		final Configuration newDisplayConfig = captor.getValue();
		final int expectedOrientation = newOrientation == SCREEN_ORIENTATION_PORTRAIT
		@@ -732,12 +732,12 @@ public class DisplayContentTests extends WindowTestsBase {

		final ActivityStack stack =
		new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootActivityContainer)
		.setDisplay(dc.mAcitvityDisplay).build();
		.setDisplay(dc.mActivityDisplay).build();
		final ActivityRecord activity = stack.topTask().getTopActivity();

		activity.setRequestedOrientation(newOrientation);

		verify(dc.mAcitvityDisplay, never()).updateDisplayOverrideConfigurationLocked(any(),
		verify(dc.mActivityDisplay, never()).updateDisplayOverrideConfigurationLocked(any(),
		eq(activity), anyBoolean(), same(null));
		assertEquals(dc.getDisplayRotation().getUserRotation(), dc.getRotation());
		}