Merge "Remove unused codes." into tm-dev
diff --git a/nearby/tests/cts/fastpair/Android.bp b/nearby/tests/cts/fastpair/Android.bp
index 599fe5c..6dc1af8 100644
--- a/nearby/tests/cts/fastpair/Android.bp
+++ b/nearby/tests/cts/fastpair/Android.bp
@@ -37,6 +37,7 @@
"general-tests",
"mts-tethering",
],
+ certificate: "platform",
platform_apis: true,
sdk_version: "module_current",
min_sdk_version: "30",
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyFrameworkInitializerTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyFrameworkInitializerTest.java
index 370bfe1..cf43cb1 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyFrameworkInitializerTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyFrameworkInitializerTest.java
@@ -16,12 +16,16 @@
package android.nearby.cts;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
import android.nearby.NearbyFrameworkInitializer;
import android.os.Build;
import androidx.annotation.RequiresApi;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,15 +35,11 @@
@RequiresApi(Build.VERSION_CODES.TIRAMISU)
public class NearbyFrameworkInitializerTest {
-// // TODO(b/215435710) This test cannot pass now because our test cannot access system API.
-// // run "adb root && adb shell setenforce permissive" and uncomment testServicesRegistered,
-// // test passes.
-// @Test
-// public void testServicesRegistered() {
-// Context ctx = InstrumentationRegistry.getInstrumentation().getContext();
-// assertNotNull( "NearbyManager not registered",
-// ctx.getSystemService(Context.NEARBY_SERVICE));
-// }
+ @Test
+ public void testServicesRegistered() {
+ Context ctx = InstrumentationRegistry.getInstrumentation().getContext();
+ assertThat(ctx.getSystemService(Context.NEARBY_SERVICE)).isNotNull();
+ }
// registerServiceWrappers can only be called during initialization and should throw otherwise
@Test(expected = IllegalStateException.class)