Remove ClientModeImpl msg ids from WifiMonitor

Bug: 117601161
Test: atest com.android.server.wifi

Change-Id: I776a6d3d0273e2c45cc032e2a8db0fb01d26bb36

3 files changed, 19 insertions, 21 deletions

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index f1165d775..b6f79464c 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -549,9 +549,6 @@ public class ClientModeImpl extends StateMachine {
     /* Link configuration (IP address, DNS, ...) changes notified via netlink */
     static final int CMD_UPDATE_LINKPROPERTIES                          = BASE + 140;
 
-    /* Supplicant is trying to associate to a given BSSID */
-    static final int CMD_TARGET_BSSID                                   = BASE + 141;
-
     static final int CMD_START_CONNECT                                  = BASE + 143;
 
     private static final int NETWORK_STATUS_UNWANTED_DISCONNECT         = 0;
@@ -562,8 +559,6 @@ public class ClientModeImpl extends StateMachine {
 
     static final int CMD_START_ROAM                                     = BASE + 145;
 
-    static final int CMD_ASSOCIATED_BSSID                               = BASE + 147;
-
     static final int CMD_NETWORK_STATUS                                 = BASE + 148;
 
     /* A layer 3 neighbor on the Wi-Fi link became unreachable. */
@@ -920,8 +915,9 @@ public class ClientModeImpl extends StateMachine {
     }
 
     private void registerForWifiMonitorEvents()  {
-        mWifiMonitor.registerHandler(mInterfaceName, CMD_TARGET_BSSID, getHandler());
-        mWifiMonitor.registerHandler(mInterfaceName, CMD_ASSOCIATED_BSSID, getHandler());
+        mWifiMonitor.registerHandler(mInterfaceName, WifiMonitor.TARGET_BSSID_EVENT, getHandler());
+        mWifiMonitor.registerHandler(mInterfaceName, WifiMonitor.ASSOCIATED_BSSID_EVENT,
+                getHandler());
         mWifiMonitor.registerHandler(mInterfaceName, WifiMonitor.ANQP_DONE_EVENT, getHandler());
         mWifiMonitor.registerHandler(mInterfaceName, WifiMonitor.ASSOCIATION_REJECTION_EVENT,
                 getHandler());
@@ -955,9 +951,9 @@ public class ClientModeImpl extends StateMachine {
                 mWifiMetrics.getHandler());
         mWifiMonitor.registerHandler(mInterfaceName, WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT,
                 mWifiMetrics.getHandler());
-        mWifiMonitor.registerHandler(mInterfaceName, CMD_ASSOCIATED_BSSID,
+        mWifiMonitor.registerHandler(mInterfaceName, WifiMonitor.ASSOCIATED_BSSID_EVENT,
                 mWifiMetrics.getHandler());
-        mWifiMonitor.registerHandler(mInterfaceName, CMD_TARGET_BSSID,
+        mWifiMonitor.registerHandler(mInterfaceName, WifiMonitor.TARGET_BSSID_EVENT,
                 mWifiMetrics.getHandler());
         mWifiMonitor.registerHandler(mInterfaceName, WifiMonitor.NETWORK_CONNECTION_EVENT,
                 mWifiInjector.getWifiLastResortWatchdog().getHandler());
@@ -2217,8 +2213,8 @@ public class ClientModeImpl extends StateMachine {
                     sb.append(" last=").append(key);
                 }
                 break;
-            case CMD_TARGET_BSSID:
-            case CMD_ASSOCIATED_BSSID:
+            case WifiMonitor.TARGET_BSSID_EVENT:
+            case WifiMonitor.ASSOCIATED_BSSID_EVENT:
                 sb.append(" ");
                 sb.append(Integer.toString(msg.arg1));
                 sb.append(" ");
@@ -3544,10 +3540,10 @@ public class ClientModeImpl extends StateMachine {
                 case CMD_POST_DHCP_ACTION:
                 case WifiMonitor.SUP_REQUEST_IDENTITY:
                 case WifiMonitor.SUP_REQUEST_SIM_AUTH:
-                case CMD_TARGET_BSSID:
+                case WifiMonitor.TARGET_BSSID_EVENT:
                 case CMD_START_CONNECT:
                 case CMD_START_ROAM:
-                case CMD_ASSOCIATED_BSSID:
+                case WifiMonitor.ASSOCIATED_BSSID_EVENT:
                 case CMD_UNWANTED_NETWORK:
                 case CMD_DISCONNECTING_WATCHDOG_TIMER:
                 case CMD_ROAM_WATCHDOG_TIMER:
@@ -4410,7 +4406,7 @@ public class ClientModeImpl extends StateMachine {
                         sendMessage(CMD_DISCONNECT);
                     }
                     break;
-                case CMD_ASSOCIATED_BSSID:
+                case WifiMonitor.ASSOCIATED_BSSID_EVENT:
                     // This is where we can confirm the connection BSSID. Use it to find the
                     // right ScanDetail to populate metrics.
                     String someBssid = (String) message.obj;
@@ -4538,7 +4534,7 @@ public class ClientModeImpl extends StateMachine {
                             mPasspointManager.getAllMatchingFqdnsForScanResults(
                                     (List<ScanResult>) message.obj));
                     break;
-                case CMD_TARGET_BSSID:
+                case WifiMonitor.TARGET_BSSID_EVENT:
                     // Trying to associate to this BSSID
                     if (message.obj != null) {
                         mTargetRoamBSSID = (String) message.obj;
@@ -5161,7 +5157,7 @@ public class ClientModeImpl extends StateMachine {
                                 WifiManager.RSSI_PKTCNT_FETCH_FAILED, WifiManager.ERROR);
                     }
                     break;
-                case CMD_ASSOCIATED_BSSID:
+                case WifiMonitor.ASSOCIATED_BSSID_EVENT:
                     if ((String) message.obj == null) {
                         logw("Associated command w/o BSSID");
                         break;
@@ -5709,7 +5705,7 @@ public class ClientModeImpl extends StateMachine {
                     boolean accept = (message.arg1 != 0);
                     mWifiConfigManager.setNetworkNoInternetAccessExpected(mLastNetworkId, accept);
                     break;
-                case CMD_ASSOCIATED_BSSID:
+                case WifiMonitor.ASSOCIATED_BSSID_EVENT:
                     // ASSOCIATING to a new BSSID while already connected, indicates
                     // that driver is roaming
                     mLastDriverRoamAttempt = mClock.getWallClockMillis();
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java
index 82445f670..8ce13b6ee 100644
--- a/service/java/com/android/server/wifi/WifiMetrics.java
+++ b/service/java/com/android/server/wifi/WifiMetrics.java
@@ -3664,10 +3664,10 @@ public class WifiMetrics {
                 StateChangeResult stateChangeResult = (StateChangeResult) msg.obj;
                 mSupplicantStateChangeBitmask |= supplicantStateToBit(stateChangeResult.state);
                 break;
-            case ClientModeImpl.CMD_ASSOCIATED_BSSID:
+            case WifiMonitor.ASSOCIATED_BSSID_EVENT:
                 event.type = StaEvent.TYPE_CMD_ASSOCIATED_BSSID;
                 break;
-            case ClientModeImpl.CMD_TARGET_BSSID:
+            case WifiMonitor.TARGET_BSSID_EVENT:
                 event.type = StaEvent.TYPE_CMD_TARGET_BSSID;
                 break;
             default:
diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java
index 54b1d6bed..59d844aed 100644
--- a/service/java/com/android/server/wifi/WifiMonitor.java
+++ b/service/java/com/android/server/wifi/WifiMonitor.java
@@ -85,6 +85,8 @@ public class WifiMonitor {
     /* Indicates assoc reject event */
     public static final int ASSOCIATION_REJECTION_EVENT          = BASE + 43;
     public static final int ANQP_DONE_EVENT                      = BASE + 44;
+    public static final int ASSOCIATED_BSSID_EVENT               = BASE + 45;
+    public static final int TARGET_BSSID_EVENT                   = BASE + 46;
 
     /* hotspot 2.0 ANQP events */
     public static final int GAS_QUERY_START_EVENT                = BASE + 51;
@@ -473,7 +475,7 @@ public class WifiMonitor {
      * @param bssid BSSID of the access point.
      */
     public void broadcastAssociatedBssidEvent(String iface, String bssid) {
-        sendMessage(iface, ClientModeImpl.CMD_ASSOCIATED_BSSID, 0, 0, bssid);
+        sendMessage(iface, ASSOCIATED_BSSID_EVENT, 0, 0, bssid);
     }
 
     /**
@@ -483,7 +485,7 @@ public class WifiMonitor {
      * @param bssid BSSID of the access point.
      */
     public void broadcastTargetBssidEvent(String iface, String bssid) {
-        sendMessage(iface, ClientModeImpl.CMD_TARGET_BSSID, 0, 0, bssid);
+        sendMessage(iface, TARGET_BSSID_EVENT, 0, 0, bssid);
     }
 
     /**