summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Chyn <kchyn@google.com> 2023-10-10 01:27:05 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-10-10 01:27:05 +0000
commitcbeabedcd1ff0d3b51bfa4c364c89a76549c08fa (patch)
tree9e6bb5a8c2459189b117383f9f18034e251eab39
parentc48014ff4ea609325f92c9912880914883188c18 (diff)
parent502747c933e4ed4f86612a129ddd95d970460fc6 (diff)
Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main
-rw-r--r--services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java
index d8e4fdae5a34..7189383d180e 100644
--- a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java
@@ -285,6 +285,7 @@ public final class DeviceStateManagerServiceTest {
assertEquals(info.currentState, DEFAULT_DEVICE_STATE.getIdentifier());
}
+ @FlakyTest(bugId = 297949293)
@Test
public void getDeviceStateInfo_baseStateAndCommittedStateNotSet() throws RemoteException {
// Create a provider and a service without an initial base state.