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

Commit 11a1cb76 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8364388 from a76e2766 to main-cg-testing-release 

Change-Id: Ifc2e5b7f1e3d7258c044fa296f7f599e0f424713
parents d997eae0 a76e2766

Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -165,6 +165,9 @@ java_library { 
    srcs: [

    srcs: [

        "apishim/33/**/*.java",

        "apishim/33/**/*.java",

    ],

    ],

    static_libs: [

        "net-utils-framework-common",

    ],

    libs: [

    libs: [

        "NetworkStackShimsCommon",

        "NetworkStackShimsCommon",

        "NetworkStackApi29Shims",

        "NetworkStackApi29Shims",

apishim/29/com/android/networkstack/apishim/api29/NsdShimImpl.java

+20 −2
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ import androidx.annotation.RequiresApi; 
import com.android.networkstack.apishim.common.NsdShim;

import com.android.networkstack.apishim.common.NsdShim;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;





import java.util.concurrent.Executor;



/**

/**

 * Implementation of {@link NsdShim}.

 * Implementation of {@link NsdShim}.

 */

 */
@@ -54,18 +56,34 @@ public class NsdShimImpl implements NsdShim { 
        // No-op: NsdServiceInfo has no Network before T

        // No-op: NsdServiceInfo has no Network before T

    }

    }





    @Override

    public void registerService(@NonNull NsdManager nsdManager, @NonNull NsdServiceInfo serviceInfo,

            int protocolType, @NonNull Executor executor,

            @NonNull NsdManager.RegistrationListener listener) throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Register with an executor is only supported on T+");

    }



    @Override

    @Override

    public void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

    public void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

            int protocolType, @Nullable Network network,

            int protocolType, @Nullable Network network,

            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException {

            @NonNull Executor executor, @NonNull NsdManager.DiscoveryListener listener)

            throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Discover on network is only supported on T+");

        throw new UnsupportedApiLevelException("Discover on network is only supported on T+");

    }

    }





    @Override

    @Override

    public void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

    public void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

            int protocolType, @Nullable NetworkRequest request,

            int protocolType, @Nullable NetworkRequest request,

            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException {

            @NonNull Executor executor, @NonNull NsdManager.DiscoveryListener listener)

            throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException(

        throw new UnsupportedApiLevelException(

                "Discover with NetworkRequest is only supported on T+");

                "Discover with NetworkRequest is only supported on T+");

    }

    }



    @Override

    public void resolveService(@NonNull NsdManager nsdManager, @NonNull NsdServiceInfo serviceInfo,

            @NonNull Executor executor, @NonNull NsdManager.ResolveListener resolveListener)

            throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Resolve with executor is only supported on T+");

    }

}
 
}

apishim/33/com/android/networkstack/apishim/EthernetManagerShimImpl.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import androidx.annotation.RequiresApi; 




import com.android.networkstack.apishim.common.EthernetManagerShim;

import com.android.networkstack.apishim.common.EthernetManagerShim;





import java.util.List;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;
@@ -95,4 +96,10 @@ public class EthernetManagerShimImpl 
    public void setIncludeTestInterfaces(boolean include) {

    public void setIncludeTestInterfaces(boolean include) {

        mEm.setIncludeTestInterfaces(include);

        mEm.setIncludeTestInterfaces(include);

    }

    }



    @Override

    @NonNull

    public List<String> getInterfaceList() {

        return mEm.getInterfaceList();

    }

}
 
}

apishim/33/com/android/networkstack/apishim/NsdShimImpl.java

+22 −4
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ import com.android.modules.utils.build.SdkLevel; 
import com.android.networkstack.apishim.common.NsdShim;

import com.android.networkstack.apishim.common.NsdShim;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;





import java.util.concurrent.Executor;



/**

/**

 * Implementation of {@link com.android.networkstack.apishim.common.NsdShim}.

 * Implementation of {@link com.android.networkstack.apishim.common.NsdShim}.

 */

 */
@@ -59,17 +61,33 @@ public class NsdShimImpl extends com.android.networkstack.apishim.api31.NsdShimI 
        serviceInfo.setNetwork(network);

        serviceInfo.setNetwork(network);

    }

    }





    @Override

    public void registerService(@NonNull NsdManager nsdManager, @NonNull NsdServiceInfo serviceInfo,

            int protocolType, @NonNull Executor executor,

            @NonNull NsdManager.RegistrationListener listener) {

        nsdManager.registerService(serviceInfo, protocolType, executor, listener);

    }



    @Override

    @Override

    public void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

    public void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

            int protocolType, @Nullable Network network,

            int protocolType, @Nullable Network network,

            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException {

            @NonNull Executor executor, @NonNull NsdManager.DiscoveryListener listener)

        nsdManager.discoverServices(serviceType, protocolType, network, listener);

            throws UnsupportedApiLevelException {

        nsdManager.discoverServices(serviceType, protocolType, network, executor, listener);

    }

    }





    @Override

    @Override

    public void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

    public void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

            int protocolType, @Nullable NetworkRequest request,

            int protocolType, @Nullable NetworkRequest request,

            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException {

            @NonNull Executor executor, @NonNull NsdManager.DiscoveryListener listener)

        nsdManager.discoverServices(serviceType, protocolType, request, listener);

            throws UnsupportedApiLevelException {

        nsdManager.discoverServices(serviceType, protocolType, request, executor, listener);

    }



    @Override

    public void resolveService(@NonNull NsdManager nsdManager, @NonNull NsdServiceInfo serviceInfo,

            @NonNull Executor executor, @NonNull NsdManager.ResolveListener resolveListener)

            throws UnsupportedApiLevelException {

        nsdManager.resolveService(serviceInfo, executor, resolveListener);

    }

    }

}
 
}

apishim/33/com/android/networkstack/apishim/TelephonyManagerShimImpl.java

+21 −11
Original line number Original line Diff line number Diff line
@@ -16,9 +16,11 @@ 




package com.android.networkstack.apishim;

package com.android.networkstack.apishim;





import static com.android.net.module.util.CollectionUtils.toIntArray;



import android.os.Build;

import android.os.Build;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager.CarrierPrivilegesListener;

import android.telephony.TelephonyManager.CarrierPrivilegesCallback;





import androidx.annotation.RequiresApi;

import androidx.annotation.RequiresApi;
@@ -27,6 +29,7 @@ import com.android.networkstack.apishim.common.UnsupportedApiLevelException; 




import java.util.HashMap;

import java.util.HashMap;

import java.util.List;

import java.util.List;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;





/**

/**
@@ -35,34 +38,41 @@ import java.util.concurrent.Executor; 
@RequiresApi(Build.VERSION_CODES.TIRAMISU)

@RequiresApi(Build.VERSION_CODES.TIRAMISU)

public class TelephonyManagerShimImpl extends

public class TelephonyManagerShimImpl extends

        com.android.networkstack.apishim.api31.TelephonyManagerShimImpl {

        com.android.networkstack.apishim.api31.TelephonyManagerShimImpl {

    private HashMap<CarrierPrivilegesListenerShim, CarrierPrivilegesListener> mListenerMap =

    private HashMap<CarrierPrivilegesListenerShim, CarrierPrivilegesCallback> mListenerMap =

            new HashMap<>();

            new HashMap<>();

    public TelephonyManagerShimImpl(TelephonyManager telephonyManager) {

    public TelephonyManagerShimImpl(TelephonyManager telephonyManager) {

        super(telephonyManager);

        super(telephonyManager);

    }

    }





    /** See android.telephony.TelephonyManager#addCarrierPrivilegesListener */

    /** See android.telephony.TelephonyManager#registerCarrierPrivilegesCallback */

    public void addCarrierPrivilegesListener(

    public void addCarrierPrivilegesListener(

            int logicalSlotIndex,

            int logicalSlotIndex,

            Executor executor,

            Executor executor,

            CarrierPrivilegesListenerShim listener)

            CarrierPrivilegesListenerShim listener)

            throws UnsupportedApiLevelException {

            throws UnsupportedApiLevelException {

        CarrierPrivilegesListener carrierPrivilegesListener = new CarrierPrivilegesListener() {

        CarrierPrivilegesCallback carrierPrivilegesCallback = new CarrierPrivilegesCallback() {

            public void onCarrierPrivilegesChanged(

            public void onCarrierPrivilegesChanged(

                    List<String> privilegedPackageNames,

                    Set<String> privilegedPackageNames,

                    int[] privilegedUids) {

                    Set<Integer> privilegedUids) {

                listener.onCarrierPrivilegesChanged(privilegedPackageNames, privilegedUids);

                // TODO(b/221306368): Rebuild thoroughly based on onCarrierServiceChanged interface

                // This is the minimum change to remove the dependency on the obsoleted API in

                // CarrierPrivilegesListener. A follow-up CL should refactor Connectivity modules

                // with carrier service change API instead.

                List<String> pkgNames = List.copyOf(privilegedPackageNames);

                int[] pkgUids = toIntArray(privilegedUids);

                listener.onCarrierPrivilegesChanged(pkgNames, pkgUids);

            }

            }

        };

        };

        mTm.addCarrierPrivilegesListener(logicalSlotIndex, executor, carrierPrivilegesListener);

        mTm.registerCarrierPrivilegesCallback(logicalSlotIndex, executor,

        mListenerMap.put(listener, carrierPrivilegesListener);

                carrierPrivilegesCallback);

        mListenerMap.put(listener, carrierPrivilegesCallback);

    }

    }





    /** See android.telephony.TelephonyManager#addCarrierPrivilegesListener */

    /** See android.telephony.TelephonyManager#unregisterCarrierPrivilegesCallback */

    public void removeCarrierPrivilegesListener(

    public void removeCarrierPrivilegesListener(

            CarrierPrivilegesListenerShim listener)

            CarrierPrivilegesListenerShim listener)

            throws UnsupportedApiLevelException {

            throws UnsupportedApiLevelException {

        mTm.removeCarrierPrivilegesListener(mListenerMap.get(listener));

        mTm.unregisterCarrierPrivilegesCallback(mListenerMap.get(listener));

        mListenerMap.remove(listener);

        mListenerMap.remove(listener);

    }

    }