Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c8ab2cf authored by Yan Yan's avatar Yan Yan Committed by Gerrit Code Review
Browse files

Merge "VCN: Remove hidden APIs for build type and vcn service string" into main

parents 1dd87ad1 0553b04f

core/java/android/net/vcn/VcnManager.java

+5 −1
Original line number Diff line number Diff line
@@ -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

     *

services/core/java/com/android/server/VcnManagementService.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

            }