| commit | cbeabedcd1ff0d3b51bfa4c364c89a76549c08fa | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Tue Oct 10 01:27:05 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Oct 10 01:27:05 2023 +0000 |
| tree | 9e6bb5a8c2459189b117383f9f18034e251eab39 | |
| parent | c48014ff4ea609325f92c9912880914883188c18 [diff] | |
| parent | 502747c933e4ed4f86612a129ddd95d970460fc6 [diff] |
Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main
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 d8e4fda..7189383 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 @@ 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.