diff options
| author | 2023-10-10 04:01:34 +0000 | |
|---|---|---|
| committer | 2023-10-10 04:01:34 +0000 | |
| commit | db2fd9b219c427884b1bd88cb4a344a4f9ff036d (patch) | |
| tree | 88d8ee76308b25d24bc6987408cd78b59217d764 | |
| parent | e39dc0014907e266c8becc1283edfc9d5bde8f2a (diff) | |
| parent | 4a2c423522c7f293044de9c317233f7a5bc0288f (diff) | |
Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main am: cbeabedcd1 am: 30edac2ba5 am: 2c4ed3c22f am: 4a2c423522
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773606
Change-Id: I44941aeac1c510e436897acbe6344cdb8ea25ddb
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 7d735632b675..7dcfc88e998c 100644 --- a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java @@ -284,6 +284,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. |