Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix FlakyTest import" into sc-v2-dev am: 1b0b53f968 am: bfa662af04

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

Change-Id: Id918bd322c23c258ec95d12da74650f16d84abf1
This commit is contained in:
TreeHugger Robot
2021-09-24 03:45:54 +00:00
committed by Automerger Merge Worker
parent 5e717df024 bfa662af04
commit 2e28c81ce2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;