Avoid calling Class#getSimpleName from WifiStateMachine when not necessary.

BUG: 24507822

Change-Id: I7debe415186d6cfb9404ac9ccf309fa1cbd78579

1 files changed, 27 insertions, 30 deletions

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index e33c6ce34..abae99886 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -2641,13 +2641,10 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
      * ******************************************************
      */
 
-    private void logStateAndMessage(Message message, String state) {
+    private void logStateAndMessage(Message message, State state) {
         messageHandlingStatus = 0;
         if (mLogMessages) {
-            //long now = SystemClock.elapsedRealtimeNanos();
-            //String ts = String.format("[%,d us]", now/1000);
-
-            logd(" " + state + " " + getLogRecString(message));
+            logd(" " + state.getClass().getSimpleName() + " " + getLogRecString(message));
         }
     }
 
@@ -5534,7 +5531,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
     class DefaultState extends State {
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch (message.what) {
                 case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED: {
@@ -5820,7 +5817,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
             switch (message.what) {
                 case CMD_START_SUPPLICANT:
                     if (mWifiNative.loadDriver()) {
@@ -5931,7 +5928,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case WifiMonitor.SUP_CONNECTION_EVENT:
@@ -6023,7 +6020,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case CMD_STOP_SUPPLICANT:   /* Supplicant stopped by user */
@@ -6163,7 +6160,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case WifiMonitor.SUP_CONNECTION_EVENT:
@@ -6212,7 +6209,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
@@ -6372,7 +6369,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case CMD_START_SCAN:
@@ -6551,7 +6548,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case WifiStateMachine.CMD_DISABLE_P2P_RSP:
@@ -6587,7 +6584,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
     class DriverStoppingState extends State {
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
@@ -6620,7 +6617,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
     class DriverStoppedState extends State {
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
             switch (message.what) {
                 case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
                     StateChangeResult stateChangeResult = (StateChangeResult) message.obj;
@@ -6652,7 +6649,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case CMD_SET_OPERATIONAL_MODE:
@@ -7196,7 +7193,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             String bssid;
             String ssid;
             NetworkUpdateResult result;
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch (message.what) {
                 case WifiMonitor.ASSOCIATION_REJECTION_EVENT:
@@ -8260,7 +8257,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch (message.what) {
               case DhcpStateMachine.CMD_PRE_DHCP_ACTION:
@@ -8671,7 +8668,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
       @Override
       public boolean processMessage(Message message) {
-          logStateAndMessage(message, getClass().getSimpleName());
+          logStateAndMessage(message, this);
 
           switch(message.what) {
               case CMD_STATIC_IP_SUCCESS:
@@ -8730,7 +8727,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch (message.what) {
                 case WifiWatchdogStateMachine.POOR_LINK_DETECTED:
@@ -8794,7 +8791,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
             WifiConfiguration config;
             switch (message.what) {
                 case CMD_IP_CONFIGURATION_LOST:
@@ -8968,7 +8965,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         @Override
         public boolean processMessage(Message message) {
             WifiConfiguration config = null;
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch (message.what) {
                 case CMD_RESTART_AUTOJOIN_OFFLOAD:
@@ -9266,7 +9263,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
             switch (message.what) {
                 case CMD_SET_OPERATIONAL_MODE:
                     if (message.arg1 != CONNECT_MODE) {
@@ -9368,7 +9365,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         public boolean processMessage(Message message) {
             boolean ret = HANDLED;
 
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch (message.what) {
                 case CMD_NO_NETWORKS_PERIODIC_SCAN:
@@ -9603,7 +9600,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch (message.what) {
                 case WifiMonitor.WPS_SUCCESS_EVENT:
@@ -9723,7 +9720,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case CMD_START_SUPPLICANT:
@@ -9767,7 +9764,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
     class SoftApStartedState extends State {
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case CMD_STOP_AP:
@@ -9811,7 +9808,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case CMD_TETHER_STATE_CHANGE:
@@ -9851,7 +9848,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
     class TetheredState extends State {
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case CMD_TETHER_STATE_CHANGE:
@@ -9887,7 +9884,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
         @Override
         public boolean processMessage(Message message) {
-            logStateAndMessage(message, getClass().getSimpleName());
+            logStateAndMessage(message, this);
 
             switch(message.what) {
                 case CMD_TETHER_STATE_CHANGE: