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

Commit 59f45fdd authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Add Nsd shim for discover with NetworkRequest 

The API is being added in T.

Bug: 190249673
Test: atest NsdManagerTest
Change-Id: I9e7f373bc85f0039a564ceb80f7b8baee21f5346
parent 4a97abad

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

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.networkstack.apishim.api29;



import android.net.Network;

import android.net.NetworkRequest;

import android.net.nsd.NsdManager;

import android.net.nsd.NsdServiceInfo;

import android.os.Build;
@@ -59,4 +60,12 @@ public class NsdShimImpl implements NsdShim { 
            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException {

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

    }



    @Override

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

            int protocolType, @Nullable NetworkRequest request,

            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException(

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

    }

}

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

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.networkstack.apishim;



import android.net.Network;

import android.net.NetworkRequest;

import android.net.nsd.NsdManager;

import android.net.nsd.NsdServiceInfo;

import android.os.Build;
@@ -64,4 +65,11 @@ public class NsdShimImpl extends com.android.networkstack.apishim.api31.NsdShimI 
            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException {

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

    }



    @Override

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

            int protocolType, @Nullable NetworkRequest request,

            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException {

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

    }

}

apishim/common/com/android/networkstack/apishim/common/NsdShim.java

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.networkstack.apishim.common;



import android.net.Network;

import android.net.NetworkRequest;

import android.net.nsd.NsdManager;

import android.net.nsd.NsdServiceInfo;
@@ -43,4 +44,11 @@ public interface NsdShim { 
    void discoverServices(@NonNull NsdManager nsdManager, @NonNull String serviceType,

            int protocolType, @Nullable Network network,

            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException;



    /**

     * @see NsdManager#discoverServices(String, int, NetworkRequest, NsdManager.DiscoveryListener)

     */

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

            int protocolType, @Nullable NetworkRequest request,

            @NonNull NsdManager.DiscoveryListener listener) throws UnsupportedApiLevelException;

}