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

Merge "Fix typo of field in DisplayContent"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-08 04:31:43 +00:00
committed by Android (Google) Code Review
parent 90e0908739 d1549d248d
commit 95870ec6f7
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

4
services/core/java/com/android/server/wm/RootActivityContainer.java
View File

@@ -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;

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

@@ -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);
}
}

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

@@ -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 */);
}
}

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

@@ -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());
}

8
services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java
View File

@@ -138,7 +138,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
@Test
public void testIncludedApps_expectTargetAndVisible() {
mWm.setRecentsAnimationController(mController);
final ActivityStack homeStack = mDisplayContent.mAcitvityDisplay.getOrCreateStack(
final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
final AppWindowToken homeAppWindow =
new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)
@@ -163,7 +163,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
@Test
public void testWallpaperIncluded_expectTarget() throws Exception {
mWm.setRecentsAnimationController(mController);
final ActivityStack homeStack = mDisplayContent.mAcitvityDisplay.getOrCreateStack(
final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
final AppWindowToken homeAppWindow =
new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)
@@ -192,7 +192,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
@Test
public void testWallpaperAnimatorCanceled_expectAnimationKeepsRunning() throws Exception {
mWm.setRecentsAnimationController(mController);
final ActivityStack homeStack = mDisplayContent.mAcitvityDisplay.getOrCreateStack(
final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
final AppWindowToken homeAppWindow =
new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)
@@ -223,7 +223,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
@Test
public void testFinish_expectTargetAndWallpaperAdaptersRemoved() {
mWm.setRecentsAnimationController(mController);
final ActivityStack homeStack = mDisplayContent.mAcitvityDisplay.getOrCreateStack(
final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
final AppWindowToken homeAppWindow =
new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)