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

Merge "Fix flaky ActivityManagerServiceTest."

Browse Source
This commit is contained in:
Sudheer Shanka
2021-11-09 02:59:10 +00:00
committed by Android (Google) Code Review
parent 08ff01e78f 7e4ed2b387
commit 44574df5e4
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/UidObserverController.java
View File

@@ -129,6 +129,10 @@ public class UidObserverController {
return mValidateUids;
}
Runnable getDispatchRunnableForTest() {
return mDispatchRunnable;
}
@VisibleForTesting
static int mergeWithPendingChange(int currentChange, int pendingChange) {
// If there is no change in idle or active state, then keep whatever was pending.

19
services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java
View File

@@ -98,6 +98,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
@@ -164,6 +165,8 @@ public class ActivityManagerServiceTest {
mAms.mWaitForNetworkTimeoutMs = 2000;
mAms.mActivityTaskManager = new ActivityTaskManagerService(mContext);
mAms.mActivityTaskManager.initialize(null, null, mHandler.getLooper());
mHandler.setRunnablesToIgnore(
List.of(mAms.mUidObserverController.getDispatchRunnableForTest()));
}
private void mockNoteOperation() {
@@ -983,12 +986,21 @@ public class ActivityManagerServiceTest {
private static final long WAIT_FOR_MSG_TIMEOUT_MS = 4000; // 4 sec
private static final long WAIT_FOR_MSG_INTERVAL_MS = 400; // 0.4 sec
private Set<Integer> mMsgsHandled = new HashSet<>();
private final Set<Integer> mMsgsHandled = new HashSet<>();
private final List<Runnable> mRunnablesToIgnore = new ArrayList<>();
TestHandler(Looper looper) {
super(looper);
}
@Override
public void dispatchMessage(Message msg) {
if (msg.getCallback() != null && mRunnablesToIgnore.contains(msg.getCallback())) {
return;
}
super.dispatchMessage(msg);
}
@Override
public void handleMessage(Message msg) {
mMsgsHandled.add(msg.what);
@@ -1004,6 +1016,11 @@ public class ActivityManagerServiceTest {
}
}
public void setRunnablesToIgnore(List<Runnable> runnables) {
mRunnablesToIgnore.clear();
mRunnablesToIgnore.addAll(runnables);
}
public void reset() {
mMsgsHandled.clear();
}