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

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

Merge "Remove Protocol.BASE_* usage in Connectivity" am: 5dad6d6e am:... 

Merge "Remove Protocol.BASE_* usage in Connectivity" am: 5dad6d6e am: 1cab8428 am: b9a3b1b0 am: 4514d865

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

Change-Id: I6142bc4ca678a6a525855b73a3c3e28fa7b5d56c
parents c2da6494 4514d865

core/java/com/android/internal/util/Protocol.java

+0 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ public class Protocol { 
    public static final int BASE_TETHERING                                          = 0x00050000;

    public static final int BASE_NSD_MANAGER                                        = 0x00060000;

    public static final int BASE_NETWORK_STATE_TRACKER                              = 0x00070000;

    public static final int BASE_CONNECTIVITY_MANAGER                               = 0x00080000;

    public static final int BASE_NETWORK_AGENT                                      = 0x00081000;

    public static final int BASE_NETWORK_FACTORY                                    = 0x00083000;

    public static final int BASE_ETHERNET                                           = 0x00084000;

    public static final int BASE_LOWPAN                                             = 0x00085000;

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

+11 −13
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ import android.util.SparseIntArray; 
import com.android.connectivity.aidl.INetworkAgent;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Protocol;



import libcore.net.event.NetworkEventDispatcher;
@@ -3551,29 +3550,28 @@ public class ConnectivityManager { 
        }

    }



    private static final int BASE = Protocol.BASE_CONNECTIVITY_MANAGER;

    /** @hide */

    public static final int CALLBACK_PRECHECK            = BASE + 1;

    public static final int CALLBACK_PRECHECK            = 1;

    /** @hide */

    public static final int CALLBACK_AVAILABLE           = BASE + 2;

    public static final int CALLBACK_AVAILABLE           = 2;

    /** @hide arg1 = TTL */

    public static final int CALLBACK_LOSING              = BASE + 3;

    public static final int CALLBACK_LOSING              = 3;

    /** @hide */

    public static final int CALLBACK_LOST                = BASE + 4;

    public static final int CALLBACK_LOST                = 4;

    /** @hide */

    public static final int CALLBACK_UNAVAIL             = BASE + 5;

    public static final int CALLBACK_UNAVAIL             = 5;

    /** @hide */

    public static final int CALLBACK_CAP_CHANGED         = BASE + 6;

    public static final int CALLBACK_CAP_CHANGED         = 6;

    /** @hide */

    public static final int CALLBACK_IP_CHANGED          = BASE + 7;

    public static final int CALLBACK_IP_CHANGED          = 7;

    /** @hide obj = NetworkCapabilities, arg1 = seq number */

    private static final int EXPIRE_LEGACY_REQUEST       = BASE + 8;

    private static final int EXPIRE_LEGACY_REQUEST       = 8;

    /** @hide */

    public static final int CALLBACK_SUSPENDED           = BASE + 9;

    public static final int CALLBACK_SUSPENDED           = 9;

    /** @hide */

    public static final int CALLBACK_RESUMED             = BASE + 10;

    public static final int CALLBACK_RESUMED             = 10;

    /** @hide */

    public static final int CALLBACK_BLK_CHANGED         = BASE + 11;

    public static final int CALLBACK_BLK_CHANGED         = 11;



    /** @hide */

    public static String getCallbackName(int whichCallback) {

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

+4 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.util.Log; 
import com.android.connectivity.aidl.INetworkAgent;

import com.android.connectivity.aidl.INetworkAgentRegistry;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Protocol;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -125,7 +124,10 @@ public abstract class NetworkAgent { 
     */

    public final int providerId;



    private static final int BASE = Protocol.BASE_NETWORK_AGENT;

    // ConnectivityService parses message constants from itself and NetworkAgent with MessageUtils

    // for debugging purposes, and crashes if some messages have the same values.

    // TODO: have ConnectivityService store message names in different maps and remove this base

    private static final int BASE = 200;



    /**

     * Sent by ConnectivityService to the NetworkAgent to inform it of