diff options
| -rw-r--r-- | core/java/android/net/vcn/VcnManager.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/VcnManagementService.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/net/vcn/VcnManager.java b/core/java/android/net/vcn/VcnManager.java index 91cdf8d8fcae..1c9be6fb4b82 100644 --- a/core/java/android/net/vcn/VcnManager.java +++ b/core/java/android/net/vcn/VcnManager.java @@ -76,11 +76,15 @@ import java.util.concurrent.Executor; * PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION} before querying the service. If the feature is * absent, {@link Context#getSystemService} may return null. */ -@SystemService(Context.VCN_MANAGEMENT_SERVICE) +@SystemService(VcnManager.VCN_MANAGEMENT_SERVICE_STRING) @RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION) public class VcnManager { @NonNull private static final String TAG = VcnManager.class.getSimpleName(); + // TODO: b/366598445: Expose and use Context.VCN_MANAGEMENT_SERVICE + /** @hide */ + public static final String VCN_MANAGEMENT_SERVICE_STRING = "vcn_management"; + /** * Key for WiFi entry RSSI thresholds * diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index 89dfc736301a..12e8c57228d6 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -380,10 +380,12 @@ public class VcnManagementService extends IVcnManagementService.Stub { } /** Gets transports that need to be marked as restricted by the VCN from CarrierConfig */ + // TODO: b/262269892 This method was created to perform experiments before the relevant API + // was exposed. Now it is obsolete and should be removed. @VisibleForTesting(visibility = Visibility.PRIVATE) public Set<Integer> getRestrictedTransportsFromCarrierConfig( ParcelUuid subGrp, TelephonySubscriptionSnapshot lastSnapshot) { - if (!Build.IS_ENG && !Build.IS_USERDEBUG) { + if (!Build.isDebuggable()) { return RESTRICTED_TRANSPORTS_DEFAULT; } |