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

Commit 2e28c81c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix FlakyTest import" into sc-v2-dev am: 1b0b53f9 am: bfa662af 

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

Change-Id: Id918bd322c23c258ec95d12da74650f16d84abf1
parents 5e717df0 bfa662af

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

+1 −1
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ 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;

import androidx.test.filters.FlakyTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.server.wm.ActivityTaskManagerInternal;