Revert "Override process config for cold start on secondary screens"
This reverts commit ceef7461c2b082d450040b22872e691424095fc6.
Reason for revert: b/132986140
Bug: 132986140
Bug: 131915789
Change-Id: I95b28fb4d5eca1927be213e070177f8f3626d9b7
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
index f8fd64a..11a177a 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
@@ -16,8 +16,6 @@
package com.android.server.wm;
-import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
-import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Surface.ROTATION_0;
import static android.view.Surface.ROTATION_90;
@@ -40,7 +38,6 @@
import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_INVISIBLE;
import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE;
import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT;
-import static com.android.server.wm.WindowContainer.POSITION_TOP;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -59,10 +56,10 @@
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.graphics.Rect;
+import android.os.RemoteException;
import android.platform.test.annotations.Presubmit;
import android.util.MergedConfiguration;
import android.util.MutableBoolean;
-import android.view.DisplayInfo;
import android.view.IRemoteAnimationFinishedCallback;
import android.view.IRemoteAnimationRunner.Stub;
import android.view.RemoteAnimationAdapter;
@@ -601,67 +598,6 @@
assertNull(mActivity.pendingOptions);
}
- @Test
- public void testSetProcessOverridesConfig() {
- final ActivityRecord defaultDisplayActivity =
- createActivityOnDisplay(true /* defaultDisplay */, null /* process */);
- assertFalse(defaultDisplayActivity.app.registeredForDisplayConfigChanges());
-
- final ActivityRecord secondaryDisplayActivity =
- createActivityOnDisplay(false /* defaultDisplay */, null /* process */);
- assertTrue(secondaryDisplayActivity.app.registeredForDisplayConfigChanges());
- assertEquals(secondaryDisplayActivity.getDisplay().getResolvedOverrideConfiguration(),
- secondaryDisplayActivity.app.getRequestedOverrideConfiguration());
-
- assertNotEquals(defaultDisplayActivity.getConfiguration(),
- secondaryDisplayActivity.getConfiguration());
- }
-
- @Test
- public void testSetProcessDoesntOverrideConfigIfAnotherActivityPresent() {
- final ActivityRecord defaultDisplayActivity =
- createActivityOnDisplay(true /* defaultDisplay */, null /* process */);
- assertFalse(defaultDisplayActivity.app.registeredForDisplayConfigChanges());
-
- final ActivityRecord secondaryDisplayActivity =
- createActivityOnDisplay(false /* defaultDisplay */, defaultDisplayActivity.app);
- assertFalse(secondaryDisplayActivity.app.registeredForDisplayConfigChanges());
- }
-
- @Test
- public void testActivityOnDefaultDisplayClearsProcessOverride() {
- final ActivityRecord secondaryDisplayActivity =
- createActivityOnDisplay(false /* defaultDisplay */, null /* process */);
- assertTrue(secondaryDisplayActivity.app.registeredForDisplayConfigChanges());
-
- final ActivityRecord defaultDisplayActivity =
- createActivityOnDisplay(true /* defaultDisplay */,
- secondaryDisplayActivity.app);
- assertFalse(defaultDisplayActivity.app.registeredForDisplayConfigChanges());
- assertFalse(secondaryDisplayActivity.app.registeredForDisplayConfigChanges());
- }
-
- /**
- * Creates an activity on display. For non-default display request it will also create a new
- * display with custom DisplayInfo.
- */
- private ActivityRecord createActivityOnDisplay(boolean defaultDisplay,
- WindowProcessController process) {
- final ActivityDisplay display;
- if (defaultDisplay) {
- display = mRootActivityContainer.getDefaultDisplay();
- } else {
- final DisplayInfo info = new DisplayInfo();
- info.logicalWidth = 100;
- info.logicalHeight = 100;
- display = addNewActivityDisplayAt(info, POSITION_TOP);
- }
- final TestActivityStack stack = display.createStack(WINDOWING_MODE_UNDEFINED,
- ACTIVITY_TYPE_STANDARD, true /* onTop */);
- final TaskRecord task = new TaskBuilder(mSupervisor).setStack(stack).build();
- return new ActivityBuilder(mService).setTask(task).setUseProcess(process).build();
- }
-
/** Setup {@link #mActivity} as a size-compat-mode-able activity without fixed orientation. */
private void prepareFixedAspectRatioUnresizableActivity() {
setupDisplayContentForCompatDisplayInsets();
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
index d8c0de7..53b0add 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
@@ -195,7 +195,6 @@
private ActivityStack mStack;
private int mActivityFlags;
private int mLaunchMode;
- private WindowProcessController mWpc;
ActivityBuilder(ActivityTaskManagerService service) {
mService = service;
@@ -246,11 +245,6 @@
return this;
}
- ActivityBuilder setUseProcess(WindowProcessController wpc) {
- mWpc = wpc;
- return this;
- }
-
ActivityRecord build() {
if (mComponent == null) {
final int id = sCurrentActivityId++;
@@ -296,18 +290,12 @@
mTaskRecord.addActivityToTop(activity);
}
- final WindowProcessController wpc;
- if (mWpc != null) {
- wpc = mWpc;
- } else {
- wpc = new WindowProcessController(mService,
- mService.mContext.getApplicationInfo(), "name", 12345,
- UserHandle.getUserId(12345), mock(Object.class),
- mock(WindowProcessListener.class));
- wpc.setThread(mock(IApplicationThread.class));
- }
+ final WindowProcessController wpc = new WindowProcessController(mService,
+ mService.mContext.getApplicationInfo(), "name", 12345,
+ UserHandle.getUserId(12345), mock(Object.class),
+ mock(WindowProcessListener.class));
+ wpc.setThread(mock(IApplicationThread.class));
activity.setProcess(wpc);
- wpc.addActivityIfNeeded(activity);
return activity;
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java
index 2c9074e..fe45411 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java
@@ -153,6 +153,7 @@
@FlakyTest(bugId = 131005232)
public void testLandscapeSeascapeRotationByApp() {
// Some plumbing to get the service ready for rotation updates.
+ mWm.mDisplayReady = true;
mWm.mDisplayEnabled = true;
final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(
@@ -185,6 +186,7 @@
@Test
public void testLandscapeSeascapeRotationByPolicy() {
// Some plumbing to get the service ready for rotation updates.
+ mWm.mDisplayReady = true;
mWm.mDisplayEnabled = true;
final DisplayRotation spiedRotation = spy(mDisplayContent.getDisplayRotation());
diff --git a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
index 427a929..366acea 100644
--- a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
+++ b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
@@ -41,7 +41,6 @@
import android.content.ContentResolver;
import android.content.Context;
import android.content.IntentFilter;
-import android.content.res.Configuration;
import android.database.ContentObserver;
import android.hardware.display.DisplayManagerInternal;
import android.net.Uri;
@@ -176,12 +175,6 @@
// Display creation is driven by the ActivityManagerService via
// ActivityStackSupervisor. We emulate those steps here.
mWindowManagerService.mRoot.createDisplayContent(display, mock(ActivityDisplay.class));
- mWindowManagerService.displayReady();
-
- final Configuration defaultDisplayConfig =
- mWindowManagerService.computeNewConfiguration(DEFAULT_DISPLAY);
- doReturn(defaultDisplayConfig).when(atms).getGlobalConfiguration();
- doReturn(defaultDisplayConfig).when(atms).getGlobalConfigurationForPid(anyInt());
mMockTracker.stopTracking();
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
index de28b5f..3a702cb9 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
@@ -154,6 +154,7 @@
context.getDisplay().getDisplayInfo(mDisplayInfo);
mDisplayContent = createNewDisplay();
mWm.mDisplayEnabled = true;
+ mWm.mDisplayReady = true;
// Set-up some common windows.
mCommonWindows = new HashSet<>();