Merge changes from topic "start_nearby_cp" am: a3f45ecdff am: 4049ab3b87
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2006754
Change-Id: Ide11b0a42aa66f3987c67f11cb2205372daf8e87
diff --git a/service-t/src/com/android/server/ConnectivityServiceInitializer.java b/service-t/src/com/android/server/ConnectivityServiceInitializer.java
index d11f0f2..25fe5e9 100644
--- a/service-t/src/com/android/server/ConnectivityServiceInitializer.java
+++ b/service-t/src/com/android/server/ConnectivityServiceInitializer.java
@@ -20,6 +20,7 @@
import android.util.Log;
import com.android.modules.utils.build.SdkLevel;
+import com.android.networkstack.apishim.ConstantsShim;
import com.android.server.nearby.NearbyService;
/**
@@ -60,8 +61,8 @@
}
if (mNearbyService != null) {
- Log.i(TAG, "Registering " + Context.NEARBY_SERVICE);
- publishBinderService(Context.NEARBY_SERVICE, mNearbyService,
+ Log.i(TAG, "Registering " + ConstantsShim.NEARBY_SERVICE);
+ publishBinderService(ConstantsShim.NEARBY_SERVICE, mNearbyService,
/* allowIsolated= */ false);
}
}
@@ -96,6 +97,13 @@
/** Return Nearby service instance or null if current SDK is lower than T */
private NearbyService createNearbyService(final Context context) {
if (!SdkLevel.isAtLeastT()) return null;
- return new NearbyService(context);
+ try {
+ return new NearbyService(context);
+ } catch (UnsupportedOperationException e) {
+ // Nearby is not yet supported in all branches
+ // TODO: remove catch clause when it is available.
+ Log.i(TAG, "Skipping unsupported service " + ConstantsShim.NEARBY_SERVICE);
+ return null;
+ }
}
}