commit 57f1b6625f9c83a78794b45eff1cd6f55b78ef5f
author Pavel Grafov <pgrafov@google.com> Wed Mar 27 14:55:38 2019 +0000
committer Pavel Grafov <pgrafov@google.com> Wed Mar 27 17:09:39 2019 +0000
tree 541f896da8ec327aa40699bbe898a76de3490463
parent 4d7990f458625eeac4147e382dadb515ae97e7a4

Add LSS tests to presubmit.

Bug: 120536847
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
Test: insert a fail() into a test, see TH failure for patch set 1
Change-Id: Ic09abf94c1b0fdce29afe70a4fd01f31761c1208

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
index bd7774a..5b19700 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
@@ -85,10 +85,11 @@
 import android.telephony.TelephonyManager;
 import android.telephony.data.ApnSetting;
 import android.test.MoreAsserts;
-import android.test.suitebuilder.annotation.SmallTest;
 import android.util.ArraySet;
 import android.util.Pair;
 
+import androidx.test.filters.SmallTest;
+
 import com.android.internal.R;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.server.LocalServices;