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

Commit c408b6f4 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Use network list in UNDERLYING_NETWORKS_CHANGED" am: a6f4de34 am: 04b88cae 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1458448db36acce05cad6ba9f41b4d7d11bc684a
parents 3720d381 04b88cae

core/java/android/net/NetworkAgent.java

+0 −6
Original line number Diff line number Diff line
@@ -227,12 +227,6 @@ public abstract class NetworkAgent { 
     */

    public static final String REDIRECT_URL_KEY = "redirect URL";



    /**

     * Bundle key for the underlying networks in {@code EVENT_UNDERLYING_NETWORKS_CHANGED}.

     * @hide

     */

    public static final String UNDERLYING_NETWORKS_KEY = "underlyingNetworks";



     /**

     * Sent by the NetworkAgent to ConnectivityService to indicate this network was

     * explicitly selected.  This should be sent before the NetworkInfo is marked

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

+1 −7
Original line number Diff line number Diff line
@@ -2764,13 +2764,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                        Log.wtf(TAG, "Non-virtual networks cannot have underlying networks");

                        break;

                    }

                    final ArrayList<Network> underlying;

                    try {

                        underlying = ((Bundle) arg.second).getParcelableArrayList(

                                NetworkAgent.UNDERLYING_NETWORKS_KEY);

                    } catch (NullPointerException | ClassCastException e) {

                        break;

                    }

                    final List<Network> underlying = (List<Network>) arg.second;

                    final Network[] oldUnderlying = nai.declaredUnderlyingNetworks;

                    nai.declaredUnderlyingNetworks = (underlying != null)

                            ? underlying.toArray(new Network[0]) : null;

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+1 −11
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.net.NetworkMonitorManager; 
import android.net.NetworkRequest;

import android.net.NetworkState;

import android.net.TcpKeepalivePacketData;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.INetworkManagementService;
@@ -53,7 +52,6 @@ import com.android.internal.util.WakeupMessage; 
import com.android.server.ConnectivityService;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.NoSuchElementException;

import java.util.Objects;
@@ -583,16 +581,8 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 


        @Override

        public void sendUnderlyingNetworks(@Nullable List<Network> networks) {

            final Bundle args = new Bundle();

            if (networks instanceof ArrayList<?>) {

                args.putParcelableArrayList(NetworkAgent.UNDERLYING_NETWORKS_KEY,

                        (ArrayList<Network>) networks);

            } else {

                args.putParcelableArrayList(NetworkAgent.UNDERLYING_NETWORKS_KEY,

                        networks == null ? null : new ArrayList<>(networks));

            }

            mHandler.obtainMessage(NetworkAgent.EVENT_UNDERLYING_NETWORKS_CHANGED,

                    new Pair<>(NetworkAgentInfo.this, args)).sendToTarget();

                    new Pair<>(NetworkAgentInfo.this, networks)).sendToTarget();

        }

    }