From 7e6f618624f96a9ff6c533938c7f554ba8d8e6d7 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 18 Jan 2023 11:40:58 -0800 Subject: [PATCH] Remove testWedged_Registered_Prioritized. The logic for tracking ANRs for prioritized broadcasts was removed before submitting but the test was not removed and somehow presubmit didn't catch this. Bug: 265537912 Test: atest ./services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java Change-Id: Ic84fae97f1708db59fcb8d34a94d2e3b4a2ab3f8 --- .../android/server/am/BroadcastQueueTest.java | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java index 72d8556f034ea..a5a9b710c5ed5 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java @@ -1189,31 +1189,6 @@ public class BroadcastQueueTest { verifyScheduleRegisteredReceiver(callerApp, airplane); } - /** - * Verify that we detect and ANR a wedged process when delivering a - * broadcast with more than one priority tranche. - */ - @Test - public void testWedged_Registered_Prioritized() throws Exception { - // Legacy stack doesn't detect these ANRs; likely an oversight - Assume.assumeTrue(mImpl == Impl.MODERN); - - final ProcessRecord callerApp = makeActiveProcessRecord(PACKAGE_RED); - final ProcessRecord receiverGreenApp = makeActiveProcessRecord(PACKAGE_GREEN, - ProcessBehavior.WEDGE); - final ProcessRecord receiverBlueApp = makeActiveProcessRecord(PACKAGE_BLUE, - ProcessBehavior.NORMAL); - - final Intent airplane = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); - enqueueBroadcast(makeBroadcastRecord(airplane, callerApp, - List.of(makeRegisteredReceiver(receiverGreenApp, 10), - makeRegisteredReceiver(receiverBlueApp, 5)))); - - waitForIdle(); - verify(mAms).appNotResponding(eq(receiverGreenApp), any()); - verifyScheduleRegisteredReceiver(receiverBlueApp, airplane); - } - /** * Verify that we handle registered receivers in a process that always * responds with {@link DeadObjectException}, recovering to restart the