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

Commit 250855cb authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge changes from topics "vpnmove-getconnectionowneruid",... 

Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo"

* changes:
  Stop using mVpns in getConnectionOwnerUid.
  Add a VpnTransportInfo object.
  Add a registerSystemDefaultNetworkCallback method.
parents c84bc1f1 9cc08edf

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ package android.net { 
  }



  public class ConnectivityManager {

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void requestBackgroundNetwork(@NonNull android.net.NetworkRequest, @Nullable android.os.Handler, @NonNull android.net.ConnectivityManager.NetworkCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);

  }

core/java/android/net/VpnTransportInfo.java

0 → 100644
+79 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.net;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.SparseArray;



import com.android.internal.util.MessageUtils;



import java.util.Objects;



/** @hide */

public final class VpnTransportInfo implements TransportInfo, Parcelable {

    private static final SparseArray<String> sTypeToString =

            MessageUtils.findMessageNames(new Class[]{VpnManager.class}, new String[]{"TYPE_VPN_"});



    /** Type of this VPN. */

    @VpnManager.VpnType public final int type;



    public VpnTransportInfo(@VpnManager.VpnType int type) {

        this.type = type;

    }



    @Override

    public boolean equals(Object o) {

        if (!(o instanceof VpnTransportInfo)) return false;



        VpnTransportInfo that = (VpnTransportInfo) o;

        return this.type == that.type;

    }



    @Override

    public int hashCode() {

        return Objects.hash(type);

    }



    @Override

    public String toString() {

        final String typeString = sTypeToString.get(type, "VPN_TYPE_???");

        return String.format("VpnTransportInfo{%s}", typeString);

    }



    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        dest.writeInt(type);

    }



    public static final @NonNull Creator<VpnTransportInfo> CREATOR =

            new Creator<VpnTransportInfo>() {

        public VpnTransportInfo createFromParcel(Parcel in) {

            return new VpnTransportInfo(in.readInt());

        }

        public VpnTransportInfo[] newArray(int size) {

            return new VpnTransportInfo[size];

        }

    };

}

core/proto/android/net/networkrequest.proto

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ message NetworkRequestProto { 
        // higher-scoring network will not go into the background immediately,

        // but will linger and go into the background after the linger timeout.

        TYPE_BACKGROUND_REQUEST = 5;

        // Like TRACK_DEFAULT, but tracks the system default network, instead of

        // the default network of the calling application.

        TYPE_TRACK_SYSTEM_DEFAULT = 6;

    }

    // The type of the request. This is only used by the system and is always

    // NONE elsewhere.

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+52 −14
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.net.NetworkRequest.Type.BACKGROUND_REQUEST; 
import static android.net.NetworkRequest.Type.LISTEN;

import static android.net.NetworkRequest.Type.REQUEST;

import static android.net.NetworkRequest.Type.TRACK_DEFAULT;

import static android.net.NetworkRequest.Type.TRACK_SYSTEM_DEFAULT;

import static android.net.QosCallback.QosCallbackRegistrationException;



import android.annotation.CallbackExecutor;
@@ -3721,7 +3722,8 @@ public class ConnectivityManager { 
        printStackTrace();

        checkCallbackNotNull(callback);

        Preconditions.checkArgument(

                reqType == TRACK_DEFAULT || need != null, "null NetworkCapabilities");

                reqType == TRACK_DEFAULT || reqType == TRACK_SYSTEM_DEFAULT || need != null,

                "null NetworkCapabilities");

        final NetworkRequest request;

        final String callingPackageName = mContext.getOpPackageName();

        try {
@@ -4192,8 +4194,9 @@ public class ConnectivityManager { 
    }



    /**

     * Registers to receive notifications about changes in the system default network. The callbacks

     * will continue to be called until either the application exits or

     * Registers to receive notifications about changes in the application's default network. This

     * may be a physical network or a virtual network, such as a VPN that applies to the

     * application. The callbacks will continue to be called until either the application exits or

     * {@link #unregisterNetworkCallback(NetworkCallback)} is called.

     *

     * <p>To avoid performance issues due to apps leaking callbacks, the system will limit the
@@ -4206,7 +4209,7 @@ public class ConnectivityManager { 
     * {@link #unregisterNetworkCallback(NetworkCallback)}.

     *

     * @param networkCallback The {@link NetworkCallback} that the system will call as the

     *                        system default network changes.

     *                        application's default network changes.

     *                        The callback is invoked on the default internal Handler.

     * @throws RuntimeException if the app already has too many callbacks registered.

     */
@@ -4216,8 +4219,9 @@ public class ConnectivityManager { 
    }



    /**

     * Registers to receive notifications about changes in the system default network. The callbacks

     * will continue to be called until either the application exits or

     * Registers to receive notifications about changes in the application's default network. This

     * may be a physical network or a virtual network, such as a VPN that applies to the

     * application. The callbacks will continue to be called until either the application exits or

     * {@link #unregisterNetworkCallback(NetworkCallback)} is called.

     *

     * <p>To avoid performance issues due to apps leaking callbacks, the system will limit the
@@ -4230,25 +4234,59 @@ public class ConnectivityManager { 
     * {@link #unregisterNetworkCallback(NetworkCallback)}.

     *

     * @param networkCallback The {@link NetworkCallback} that the system will call as the

     *                        system default network changes.

     *                        application's default network changes.

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

     * @throws RuntimeException if the app already has too many callbacks registered.

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)

    public void registerDefaultNetworkCallback(@NonNull NetworkCallback networkCallback,

            @NonNull Handler handler) {

        // This works because if the NetworkCapabilities are null,

        // ConnectivityService takes them from the default request.

        //

        // Since the capabilities are exactly the same as the default request's

        // capabilities, this request is guaranteed, at all times, to be

        // satisfied by the same network, if any, that satisfies the default

        // request, i.e., the system default network.

        CallbackHandler cbHandler = new CallbackHandler(handler);

        sendRequestForNetwork(null /* NetworkCapabilities need */, networkCallback, 0,

                TRACK_DEFAULT, TYPE_NONE, cbHandler);

    }



    /**

     * Registers to receive notifications about changes in the system default network. The callbacks

     * will continue to be called until either the application exits or

     * {@link #unregisterNetworkCallback(NetworkCallback)} is called.

     *

     * This method should not be used to determine networking state seen by applications, because in

     * many cases, most or even all application traffic may not use the default network directly,

     * and traffic from different applications may go on different networks by default. As an

     * example, if a VPN is connected, traffic from all applications might be sent through the VPN

     * and not onto the system default network. Applications or system components desiring to do

     * determine network state as seen by applications should use other methods such as

     * {@link #registerDefaultNetworkCallback(NetworkCallback, Handler)}.

     *

     * <p>To avoid performance issues due to apps leaking callbacks, the system will limit the

     * number of outstanding requests to 100 per app (identified by their UID), shared with

     * all variants of this method, of {@link #requestNetwork} as well as

     * {@link ConnectivityDiagnosticsManager#registerConnectivityDiagnosticsCallback}.

     * Requesting a network with this method will count toward this limit. If this limit is

     * exceeded, an exception will be thrown. To avoid hitting this issue and to conserve resources,

     * make sure to unregister the callbacks with

     * {@link #unregisterNetworkCallback(NetworkCallback)}.

     *

     * @param networkCallback The {@link NetworkCallback} that the system will call as the

     *                        system default network changes.

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

     * @throws RuntimeException if the app already has too many callbacks registered.

     *

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @SuppressLint({"ExecutorRegistration", "PairedRegistration"})

    @RequiresPermission(anyOf = {

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,

            android.Manifest.permission.NETWORK_SETTINGS})

    public void registerSystemDefaultNetworkCallback(@NonNull NetworkCallback networkCallback,

            @NonNull Handler handler) {

        CallbackHandler cbHandler = new CallbackHandler(handler);

        sendRequestForNetwork(null /* NetworkCapabilities need */, networkCallback, 0,

                TRACK_SYSTEM_DEFAULT, TYPE_NONE, cbHandler);

    }



    /**

     * Requests bandwidth update for a given {@link Network} and returns whether the update request

     * is accepted by ConnectivityService. Once accepted, ConnectivityService will poll underlying

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+2 −0
Original line number Diff line number Diff line
@@ -762,12 +762,14 @@ public final class NetworkCapabilities implements Parcelable { 
        final int originalSignalStrength = mSignalStrength;

        final int originalOwnerUid = getOwnerUid();

        final int[] originalAdministratorUids = getAdministratorUids();

        final TransportInfo originalTransportInfo = getTransportInfo();

        clearAll();

        mTransportTypes = (originalTransportTypes & TEST_NETWORKS_ALLOWED_TRANSPORTS)

                | (1 << TRANSPORT_TEST);

        mNetworkCapabilities = originalCapabilities & TEST_NETWORKS_ALLOWED_CAPABILITIES;

        mNetworkSpecifier = originalSpecifier;

        mSignalStrength = originalSignalStrength;

        mTransportInfo = originalTransportInfo;



        // Only retain the owner and administrator UIDs if they match the app registering the remote

        // caller that registered the network.