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

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

Change-Id: I0c226f72d3a7819e3162994fde22f04a2ed4f9a8
This commit is contained in:
Kenneth Ford
2021-09-21 05:28:39 +00:00
committed by Automerger Merge Worker

View File

@@ -34,6 +34,7 @@ import android.hardware.devicestate.IDeviceStateManagerCallback;
import android.os.Binder; import android.os.Binder;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.platform.test.annotations.FlakyTest;
import android.platform.test.annotations.Presubmit; import android.platform.test.annotations.Presubmit;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
@@ -343,6 +344,7 @@ public final class DeviceStateManagerServiceTest {
DEFAULT_DEVICE_STATE.getIdentifier()); DEFAULT_DEVICE_STATE.getIdentifier());
} }
@FlakyTest(bugId = 200332057)
@Test @Test
public void requestState_pendingStateAtRequest() throws RemoteException { public void requestState_pendingStateAtRequest() throws RemoteException {
TestDeviceStateManagerCallback callback = new TestDeviceStateManagerCallback(); TestDeviceStateManagerCallback callback = new TestDeviceStateManagerCallback();
@@ -474,6 +476,7 @@ public final class DeviceStateManagerServiceTest {
OTHER_DEVICE_STATE.getIdentifier()); OTHER_DEVICE_STATE.getIdentifier());
} }
@FlakyTest(bugId = 200332057)
@Test @Test
public void requestState_becomesUnsupported() throws RemoteException { public void requestState_becomesUnsupported() throws RemoteException {
TestDeviceStateManagerCallback callback = new TestDeviceStateManagerCallback(); TestDeviceStateManagerCallback callback = new TestDeviceStateManagerCallback();