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

Commit 13fd8db4 authored by Frank Li's avatar Frank Li Committed by Automerger Merge Worker
Browse files

Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am:... 

Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: 2dafdfb0 am: e15c8760 am: d2e6eb1c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6192035f3be707c6f840b373579d2666ca5c3ac6
parents a57e55ea d2e6eb1c

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

+5 −48
Original line number Original line Diff line number Diff line
@@ -189,7 +189,6 @@ import android.util.SparseIntArray; 
import com.android.connectivity.aidl.INetworkAgent;

import com.android.connectivity.aidl.INetworkAgent;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.AsyncChannel;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.LocationPermissionChecker;

import com.android.internal.util.LocationPermissionChecker;

import com.android.internal.util.MessageUtils;

import com.android.internal.util.MessageUtils;
@@ -345,8 +344,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    private String mCurrentTcpBufferSizes;

    private String mCurrentTcpBufferSizes;





    private static final SparseArray<String> sMagicDecoderRing = MessageUtils.findMessageNames(

    private static final SparseArray<String> sMagicDecoderRing = MessageUtils.findMessageNames(

            new Class[] { AsyncChannel.class, ConnectivityService.class, NetworkAgent.class,

            new Class[] { ConnectivityService.class, NetworkAgent.class, NetworkAgentInfo.class });

                    NetworkAgentInfo.class });





    private enum ReapUnvalidatedNetworks {

    private enum ReapUnvalidatedNetworks {

        // Tear down networks that have no chance (e.g. even if validated) of becoming

        // Tear down networks that have no chance (e.g. even if validated) of becoming
@@ -2892,22 +2890,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            super(looper);

            super(looper);

        }

        }





        private boolean maybeHandleAsyncChannelMessage(Message msg) {

            switch (msg.what) {

                default:

                    return false;

                case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED: {

                    handleAsyncChannelHalfConnect(msg);

                    break;

                }

                case AsyncChannel.CMD_CHANNEL_DISCONNECTED: {

                    handleAsyncChannelDisconnected(msg);

                    break;

                }

            }

            return true;

        }



        private void maybeHandleNetworkAgentMessage(Message msg) {

        private void maybeHandleNetworkAgentMessage(Message msg) {

            final Pair<NetworkAgentInfo, Object> arg = (Pair<NetworkAgentInfo, Object>) msg.obj;

            final Pair<NetworkAgentInfo, Object> arg = (Pair<NetworkAgentInfo, Object>) msg.obj;

            final NetworkAgentInfo nai = arg.first;

            final NetworkAgentInfo nai = arg.first;
@@ -3199,8 +3181,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 




        @Override

        @Override

        public void handleMessage(Message msg) {

        public void handleMessage(Message msg) {

            if (!maybeHandleAsyncChannelMessage(msg)

            if (!maybeHandleNetworkMonitorMessage(msg)

                    && !maybeHandleNetworkMonitorMessage(msg)

                    && !maybeHandleNetworkAgentInfoMessage(msg)) {

                    && !maybeHandleNetworkAgentInfoMessage(msg)) {

                maybeHandleNetworkAgentMessage(msg);

                maybeHandleNetworkAgentMessage(msg);

            }

            }
@@ -3464,21 +3445,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        return false;

        return false;

    }

    }





    private void handleAsyncChannelHalfConnect(Message msg) {

        ensureRunningOnConnectivityServiceThread();

        if (mNetworkProviderInfos.containsKey(msg.replyTo)) {

            if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL) {

                if (VDBG) log("NetworkFactory connected");

                // Finish setting up the full connection

                NetworkProviderInfo npi = mNetworkProviderInfos.get(msg.replyTo);

                sendAllRequestsToProvider(npi);

            } else {

                loge("Error connecting NetworkFactory");

                mNetworkProviderInfos.remove(msg.obj);

            }

        }

    }



    private void handleNetworkAgentRegistered(Message msg) {

    private void handleNetworkAgentRegistered(Message msg) {

        final NetworkAgentInfo nai = (NetworkAgentInfo) msg.obj;

        final NetworkAgentInfo nai = (NetworkAgentInfo) msg.obj;

        if (!mNetworkAgentInfos.contains(nai)) {

        if (!mNetworkAgentInfos.contains(nai)) {
@@ -3509,14 +3475,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        }

    }

    }





    // This is a no-op if it's called with a message designating a provider that has

    // already been destroyed, because its reference will not be found in the relevant

    // maps.

    private void handleAsyncChannelDisconnected(Message msg) {

        NetworkProviderInfo npi = mNetworkProviderInfos.remove(msg.replyTo);

        if (DBG && npi != null) log("unregisterNetworkFactory for " + npi.name);

    }



    // Destroys a network, remove references to it from the internal state managed by

    // Destroys a network, remove references to it from the internal state managed by

    // ConnectivityService, free its interfaces and clean up.

    // ConnectivityService, free its interfaces and clean up.

    // Must be called on the Handler thread.

    // Must be called on the Handler thread.
@@ -5159,8 +5117,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        private final IBinder.DeathRecipient mDeathRecipient;

        private final IBinder.DeathRecipient mDeathRecipient;

        public final int providerId;

        public final int providerId;





        NetworkProviderInfo(String name, Messenger messenger, AsyncChannel asyncChannel,

        NetworkProviderInfo(String name, Messenger messenger, int providerId,

                int providerId, @NonNull IBinder.DeathRecipient deathRecipient) {

                @NonNull IBinder.DeathRecipient deathRecipient) {

            this.name = name;

            this.name = name;

            this.messenger = messenger;

            this.messenger = messenger;

            this.providerId = providerId;

            this.providerId = providerId;
@@ -5836,8 +5794,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    public int registerNetworkProvider(Messenger messenger, String name) {

    public int registerNetworkProvider(Messenger messenger, String name) {

        enforceNetworkFactoryOrSettingsPermission();

        enforceNetworkFactoryOrSettingsPermission();

        NetworkProviderInfo npi = new NetworkProviderInfo(name, messenger,

        NetworkProviderInfo npi = new NetworkProviderInfo(name, messenger,

                null /* asyncChannel */, nextNetworkProviderId(),

                nextNetworkProviderId(), () -> unregisterNetworkProvider(messenger));

                () -> unregisterNetworkProvider(messenger));

        mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_PROVIDER, npi));

        mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_PROVIDER, npi));

        return npi.providerId;

        return npi.providerId;

    }

    }