Add protected log methods to StateMachine
This allow child classes to Override the logging and
have consistent behavior across StateMachines.
Change-Id: I7e23a44d08ca304ade2d7830fd0e307f63f1879e
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 0a61972..6cf03fa 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -103,7 +103,6 @@
*/
public class WifiStateMachine extends StateMachine {
- private static final String TAG = "WifiStateMachine";
private static final String NETWORKTYPE = "WIFI";
private static final boolean DBG = false;
@@ -565,7 +564,7 @@
private final IBatteryStats mBatteryStats;
public WifiStateMachine(Context context, String wlanInterface) {
- super(TAG);
+ super("WifiStateMachine");
mContext = context;
mInterfaceName = wlanInterface;
@@ -678,7 +677,7 @@
mScanResultCache = new LruCache<String, ScanResult>(SCAN_RESULT_CACHE_SIZE);
PowerManager powerManager = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
- mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+ mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getName());
mSuspendWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "WifiSuspend");
mSuspendWakeLock.setReferenceCounted(false);
@@ -3132,14 +3131,14 @@
break;
default:
result = new WpsResult(Status.FAILURE);
- Log.e(TAG, "Invalid setup for WPS");
+ loge("Invalid setup for WPS");
break;
}
if (result.status == Status.SUCCESS) {
replyToMessage(message, WifiManager.START_WPS_SUCCEEDED, result);
transitionTo(mWpsRunningState);
} else {
- Log.e(TAG, "Failed to start WPS with config " + wpsInfo.toString());
+ loge("Failed to start WPS with config " + wpsInfo.toString());
replyToMessage(message, WifiManager.WPS_FAILED, WifiManager.ERROR);
}
break;
@@ -3465,7 +3464,7 @@
public void exit() {
/* Request a CS wakelock during transition to mobile */
checkAndSetConnectivityInstance();
- mCm.requestNetworkTransitionWakelock(TAG);
+ mCm.requestNetworkTransitionWakelock(getName());
}
}
@@ -4040,12 +4039,4 @@
msg.arg2 = srcMsg.arg2;
return msg;
}
-
- private void log(String s) {
- Log.d(TAG, s);
- }
-
- private void loge(String s) {
- Log.e(TAG, s);
- }
}
diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
index 423558f..53e6b51 100644
--- a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
@@ -77,7 +77,6 @@
/* STOPSHIP: Keep this configurable for debugging until ship */
private static boolean DBG = false;
- private static final String TAG = "WifiWatchdogStateMachine";
private static final int BASE = Protocol.BASE_WIFI_WATCHDOG;
@@ -306,7 +305,7 @@
* (all other states)
*/
private WifiWatchdogStateMachine(Context context) {
- super(TAG);
+ super("WifiWatchdogStateMachine");
mContext = context;
mContentResolver = context.getContentResolver();
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
@@ -968,14 +967,6 @@
return Settings.Global.putInt(cr, name, value ? 1 : 0);
}
- private static void logd(String s) {
- Log.d(TAG, s);
- }
-
- private static void loge(String s) {
- Log.e(TAG, s);
- }
-
/**
* Bundle of good link count parameters
*/
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
index debf988..77604a4 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
@@ -2460,11 +2460,13 @@
return msg;
}
- private void logd(String s) {
+ @Override
+ protected void logd(String s) {
Slog.d(TAG, s);
}
- private void loge(String s) {
+ @Override
+ protected void loge(String s) {
Slog.e(TAG, s);
}