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

Commit 6fab6545 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Remove handling of EVENT_UNFULFILLABLE_REQUEST 

This message is not being sent by any component anymore.

Test: built, flashed, WiFi and telephony working
Test: atest FrameworksNetTests
Bug: 138306002
Merged-In: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
Change-Id: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
(clean cherry-pick from internal branch)
parent 867e1aed

core/java/android/net/NetworkFactory.java

+0 −7
Original line number Diff line number Diff line
@@ -115,13 +115,6 @@ public class NetworkFactory extends Handler { 
     */

    private static final int CMD_SET_FILTER = BASE + 3;



    /**

     * Sent by NetworkFactory to ConnectivityService to indicate that a request is

     * unfulfillable.

     * @see #releaseRequestAsUnfulfillableByAnyFactory(NetworkRequest).

     */

    public static final int EVENT_UNFULFILLABLE_REQUEST = BASE + 4;



    private final Context mContext;

    private final ArrayList<Message> mPreConnectedQueue = new ArrayList<Message>();

    private final String LOG_TAG;

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

+1 −17
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ import android.net.Network; 
import android.net.NetworkAgent;

import android.net.NetworkCapabilities;

import android.net.NetworkConfig;

import android.net.NetworkFactory;

import android.net.NetworkInfo;

import android.net.NetworkInfo.DetailedState;

import android.net.NetworkMisc;
@@ -2835,26 +2834,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            return true;

        }



        // TODO: delete when direct use of registerNetworkFactory is no longer supported.

        private boolean maybeHandleNetworkFactoryMessage(Message msg) {

            switch (msg.what) {

                default:

                    return false;

                case NetworkFactory.EVENT_UNFULFILLABLE_REQUEST: {

                    handleReleaseNetworkRequest((NetworkRequest) msg.obj, msg.sendingUid,

                            /* callOnUnavailable */ true);

                    break;

                }

            }

            return true;

        }



        @Override

        public void handleMessage(Message msg) {

            if (!maybeHandleAsyncChannelMessage(msg)

                    && !maybeHandleNetworkMonitorMessage(msg)

                    && !maybeHandleNetworkAgentInfoMessage(msg)

                    && !maybeHandleNetworkFactoryMessage(msg)) {

                    && !maybeHandleNetworkAgentInfoMessage(msg)) {

                maybeHandleNetworkAgentMessage(msg);

            }

        }