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

Commit 32726e00 authored by markchien's avatar markchien Committed by Mark Chien
Browse files

Move NetworkCallback to last parameter for new exposed requestNetwork 

Bug: 151243698
Test: atest TetheringTests
Change-Id: I87ef1d451eefa6998b9793c4eacabae978376d24
Merged-In: I87ef1d451eefa6998b9793c4eacabae978376d24
parent 8ba389de

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4423,7 +4423,7 @@ package android.net { 
    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_FACTORY}) public int registerNetworkProvider(@NonNull android.net.NetworkProvider);

    method @Deprecated @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void registerTetheringEventCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEventCallback);

    method @Deprecated public void requestNetwork(@NonNull android.net.NetworkRequest, @NonNull android.net.ConnectivityManager.NetworkCallback, int, int, @NonNull android.os.Handler);

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void requestNetwork(@NonNull android.net.NetworkRequest, int, int, @NonNull android.os.Handler, @NonNull android.net.ConnectivityManager.NetworkCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void setAirplaneMode(boolean);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public boolean shouldAvoidBadWifi();

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(@NonNull android.net.Network, @NonNull android.os.Bundle);

core/java/android/net/ConnectivityManager.java

+17 −13
Original line number Diff line number Diff line
@@ -3686,29 +3686,29 @@ public class ConnectivityManager { 
    /**

     * Helper function to request a network with a particular legacy type.

     *

     * @deprecated This is temporarily public for tethering to backwards compatibility that uses

     * the NetworkRequest API to request networks with legacy type and relies on

     * CONNECTIVITY_ACTION broadcasts instead of NetworkCallbacks. New caller should use

     * This API is only for use in internal system code that requests networks with legacy type and

     * relies on CONNECTIVITY_ACTION broadcasts instead of NetworkCallbacks. New caller should use

     * {@link #requestNetwork(NetworkRequest, NetworkCallback, Handler)} instead.

     *

     * TODO: update said system code to rely on NetworkCallbacks and make this method private.



     * @param request {@link NetworkRequest} describing this request.

     * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note

     *                        the callback must not be shared - it uniquely specifies this request.

     * @param timeoutMs The time in milliseconds to attempt looking for a suitable network

     *                  before {@link NetworkCallback#onUnavailable()} is called. The timeout must

     *                  be a positive value (i.e. >0).

     * @param legacyType to specify the network type(#TYPE_*).

     * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.

     * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note

     *                        the callback must not be shared - it uniquely specifies this request.

     *

     * @hide

     */

    @SystemApi

    @Deprecated

    @RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)

    public void requestNetwork(@NonNull NetworkRequest request,

            @NonNull NetworkCallback networkCallback, int timeoutMs, int legacyType,

            @NonNull Handler handler) {

            int timeoutMs, int legacyType, @NonNull Handler handler,

            @NonNull NetworkCallback networkCallback) {

        if (legacyType == TYPE_NONE) {

            throw new IllegalArgumentException("TYPE_NONE is meaningless legacy type");

        }

        CallbackHandler cbHandler = new CallbackHandler(handler);

        NetworkCapabilities nc = request.networkCapabilities;

        sendRequestForNetwork(nc, networkCallback, timeoutMs, REQUEST, legacyType, cbHandler);
@@ -3807,7 +3807,8 @@ public class ConnectivityManager { 
    public void requestNetwork(@NonNull NetworkRequest request,

            @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {

        CallbackHandler cbHandler = new CallbackHandler(handler);

        requestNetwork(request, networkCallback, 0, TYPE_NONE, cbHandler);

        NetworkCapabilities nc = request.networkCapabilities;

        sendRequestForNetwork(nc, networkCallback, 0, REQUEST, TYPE_NONE, cbHandler);

    }



    /**
@@ -3840,7 +3841,9 @@ public class ConnectivityManager { 
    public void requestNetwork(@NonNull NetworkRequest request,

            @NonNull NetworkCallback networkCallback, int timeoutMs) {

        checkTimeout(timeoutMs);

        requestNetwork(request, networkCallback, timeoutMs, TYPE_NONE, getDefaultHandler());

        NetworkCapabilities nc = request.networkCapabilities;

        sendRequestForNetwork(nc, networkCallback, timeoutMs, REQUEST, TYPE_NONE,

                getDefaultHandler());

    }



    /**
@@ -3866,7 +3869,8 @@ public class ConnectivityManager { 
            @NonNull NetworkCallback networkCallback, @NonNull Handler handler, int timeoutMs) {

        checkTimeout(timeoutMs);

        CallbackHandler cbHandler = new CallbackHandler(handler);

        requestNetwork(request, networkCallback, timeoutMs, TYPE_NONE, cbHandler);

        NetworkCapabilities nc = request.networkCapabilities;

        sendRequestForNetwork(nc, networkCallback, timeoutMs, REQUEST, TYPE_NONE, cbHandler);

    }



    /**

packages/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java

+2 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ public class UpstreamNetworkMonitor { 
        // Additionally, we log a message to aid in any subsequent debugging.

        mLog.i("requesting mobile upstream network: " + mobileUpstreamRequest);



        cm().requestNetwork(mobileUpstreamRequest, mMobileNetworkCallback, 0, legacyType, mHandler);

        cm().requestNetwork(mobileUpstreamRequest, 0, legacyType, mHandler,

                mMobileNetworkCallback);

    }



    /** Release mobile network request. */

packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java

+4 −4
Original line number Diff line number Diff line
@@ -212,8 +212,8 @@ public class UpstreamNetworkMonitorTest { 
        mUNM.updateMobileRequiresDun(true);

        mUNM.registerMobileNetworkRequest();

        verify(mCM, times(1)).requestNetwork(

                any(NetworkRequest.class), any(NetworkCallback.class), anyInt(), anyInt(),

                any(Handler.class));

                any(NetworkRequest.class), anyInt(), anyInt(), any(Handler.class),

                any(NetworkCallback.class));



        assertTrue(mUNM.mobileNetworkRequested());

        assertUpstreamTypeRequested(TYPE_MOBILE_DUN);
@@ -649,8 +649,8 @@ public class UpstreamNetworkMonitorTest { 
        }



        @Override

        public void requestNetwork(NetworkRequest req, NetworkCallback cb,

                int timeoutMs, int legacyType, Handler h) {

        public void requestNetwork(NetworkRequest req,

                int timeoutMs, int legacyType, Handler h, NetworkCallback cb) {

            assertFalse(allCallbacks.containsKey(cb));

            allCallbacks.put(cb, h);

            assertFalse(requested.containsKey(cb));

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

+3 −0
Original line number Diff line number Diff line
@@ -5393,6 +5393,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    public NetworkRequest requestNetwork(NetworkCapabilities networkCapabilities,

            Messenger messenger, int timeoutMs, IBinder binder, int legacyType,

            @NonNull String callingPackageName) {

        if (legacyType != TYPE_NONE && !checkNetworkStackPermission()) {

            throw new SecurityException("Insufficient permissions to specify legacy type");

        }

        final int callingUid = Binder.getCallingUid();

        final NetworkRequest.Type type = (networkCapabilities == null)

                ? NetworkRequest.Type.TRACK_DEFAULT