Commit 4a2c4235 authored Oct 10, 2023 by Kevin Chyn Committed by Automerger Merge Worker Oct 10, 2023

Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest"...

Merge "Re-mark DeviceStateManagerServiceTest#registerCallback as FlakyTest" into main am: cbeabedc am: 30edac2b am: 2c4ed3c2

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>

services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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.