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

Commit 439447e1 authored by Kenneth Ford's avatar Kenneth Ford Committed by Automerger Merge Worker
Browse files

Merge "Marks two DeviceStateManagerService tests as flaky" into sc-v2-dev am:... 

Merge "Marks two DeviceStateManagerService tests as flaky" into sc-v2-dev am: 57f7ff4c am: f8287fcd

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

Change-Id: I7c708ebb263a7c82ef61426ed9f55a08e36b1367
parents 859480ff f8287fcd

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

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.hardware.devicestate.IDeviceStateManagerCallback; 
import android.os.Binder;

import android.os.IBinder;

import android.os.RemoteException;

import android.platform.test.annotations.FlakyTest;

import android.platform.test.annotations.Presubmit;



import androidx.test.InstrumentationRegistry;
@@ -343,6 +344,7 @@ public final class DeviceStateManagerServiceTest { 
                DEFAULT_DEVICE_STATE.getIdentifier());

    }



    @FlakyTest(bugId = 200332057)

    @Test

    public void requestState_pendingStateAtRequest() throws RemoteException {

        TestDeviceStateManagerCallback callback = new TestDeviceStateManagerCallback();
@@ -474,6 +476,7 @@ public final class DeviceStateManagerServiceTest { 
                OTHER_DEVICE_STATE.getIdentifier());

    }



    @FlakyTest(bugId = 200332057)

    @Test

    public void requestState_becomesUnsupported() throws RemoteException {

        TestDeviceStateManagerCallback callback = new TestDeviceStateManagerCallback();