diff options
| author | 2023-10-10 03:59:37 +0000 | |
|---|---|---|
| committer | 2023-10-10 03:59:37 +0000 | |
| commit | 4a2c423522c7f293044de9c317233f7a5bc0288f (patch) | |
| tree | a6bcaff6d4249c5fbcf70dc8f5c120d101466467 | |
| parent | 28d901f5836156cc0fb741953ae995ee37f67449 (diff) | |
| parent | 2c4ed3c22f7b3ac1c3662ac47f4916699be9d7fc (diff) | |
Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main am: cbeabedcd1 am: 30edac2ba5 am: 2c4ed3c22f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773606
Change-Id: I6012a37b99cd54039a71dba55dd42a8d0ced9f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java | 1 |
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 8f88ba6ff9a7..7624b0adcdf6 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. |