diff options
| author | 2023-10-10 03:26:05 +0000 | |
|---|---|---|
| committer | 2023-10-10 03:26:05 +0000 | |
| commit | 2c4ed3c22f7b3ac1c3662ac47f4916699be9d7fc (patch) | |
| tree | b1e26ac7ba6ec21f5725c25a39b9e5c15b71a151 | |
| parent | bc15dfee039eb0f3dde754d01df5d269b4741b92 (diff) | |
| parent | 30edac2ba5a4c01220c0c217e3463622d090d49f (diff) | |
Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main am: cbeabedcd1 am: 30edac2ba5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773606
Change-Id: I7e03c5ba19fd630d76a2baee9e75b9b665901bf5
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. |