Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db2fd9b2 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773606



Change-Id: I44941aeac1c510e436897acbe6344cdb8ea25ddb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e39dc001 4a2c4235

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

+1 −0
Original line number Diff line number Diff line
@@ -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.