Add proguard to nearby service target.
Also fixed a few minor issues.
Bug: 189355156
Test: install on sunfish && atest NearbyUnitTests
Change-Id: I8f5cc990e69940a48fdad24713015690bdc6d3cd
diff --git a/nearby/tests/Android.bp b/nearby/tests/Android.bp
index 09fe5ea..67a3b83 100644
--- a/nearby/tests/Android.bp
+++ b/nearby/tests/Android.bp
@@ -33,8 +33,9 @@
static_libs: [
"androidx.test.rules",
- "truth-prebuilt",
"framework-nearby-pre-jarjar",
+ "platform-test-annotations",
+ "truth-prebuilt",
],
test_suites: [
"general-tests",
diff --git a/nearby/tests/src/android/nearby/ScanRequestTest.java b/nearby/tests/src/android/nearby/ScanRequestTest.java
index 12c8edc..ab9f161 100644
--- a/nearby/tests/src/android/nearby/ScanRequestTest.java
+++ b/nearby/tests/src/android/nearby/ScanRequestTest.java
@@ -25,13 +25,18 @@
import android.os.Parcel;
import android.os.WorkSource;
+import android.platform.test.annotations.Presubmit;
import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
+import org.junit.runner.RunWith;
/** Units tests for {@link ScanRequest}. */
+@Presubmit
@SmallTest
+@RunWith(AndroidJUnit4.class)
public class ScanRequestTest {
/** Test creating a scan request. */