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/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;
}
}