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

Commit 24f9e168 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Automerger Merge Worker
Browse files

Merge "Swap parameters in QosCallback#registerQosCallback" am: bc710093 am:... 

Merge "Swap parameters in QosCallback#registerQosCallback" am: bc710093 am: cd9b3e06 am: 2e744846

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

Change-Id: Ice84bb2e6d855ed88e7e432cf49739e69c9e01de
parents db77ba6c 2e744846

packages/Connectivity/framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ package android.net { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void getLatestTetheringEntitlementResult(int, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEntitlementResultListener);

    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 public void registerQosCallback(@NonNull android.net.QosSocketInfo, @NonNull android.net.QosCallback, @NonNull java.util.concurrent.Executor);

    method public void registerQosCallback(@NonNull android.net.QosSocketInfo, @NonNull java.util.concurrent.Executor, @NonNull android.net.QosCallback);

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

    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_AIRPLANE_MODE, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void setAirplaneMode(boolean);

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

+5 −5
Original line number Diff line number Diff line
@@ -4944,20 +4944,20 @@ public class ConnectivityManager { 
     * {@link QosCallback#onError(QosCallbackException)}.  see: {@link QosCallbackException}.

     *

     * @param socketInfo the socket information used to match QoS events

     * @param callback receives qos events that satisfy socketInfo

     * @param executor The executor on which the callback will be invoked. The provided

     *                 {@link Executor} must run callback sequentially, otherwise the order of

     *                 callbacks cannot be guaranteed.

     *                 callbacks cannot be guaranteed.onQosCallbackRegistered

     * @param callback receives qos events that satisfy socketInfo

     *

     * @hide

     */

    @SystemApi

    public void registerQosCallback(@NonNull final QosSocketInfo socketInfo,

            @NonNull final QosCallback callback,

            @CallbackExecutor @NonNull final Executor executor) {

            @CallbackExecutor @NonNull final Executor executor,

            @NonNull final QosCallback callback) {

        Objects.requireNonNull(socketInfo, "socketInfo must be non-null");

        Objects.requireNonNull(callback, "callback must be non-null");

        Objects.requireNonNull(executor, "executor must be non-null");

        Objects.requireNonNull(callback, "callback must be non-null");



        try {

            synchronized (mQosCallbackConnections) {