From 532b6143f6369224b0c220bad08ae48a979b5adf Mon Sep 17 00:00:00 2001
From: Paul Jensen <pauljensen@google.com>
Date: Mon, 10 Nov 2014 09:50:02 -0500
Subject: [PATCH] Fix NetworkMonitor logging to include NetID.

This was broken when NetID selection was moved to after
NetworkAgentInfo construction time.  NetworkMonitor inherits
from StateMachine whose log tag is immutable after construction
making it impossible to include the NetID.  Instead define a
simple log function in NetworkMonitor that includes correct
NetID.  This makes debugging via logs much easier and avoids
ambiguities that can make logs useless.

Change-Id: Ie72fc210b92bd425184d288b35ed476669e2e073
---
 .../com/android/server/connectivity/NetworkMonitor.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
index fb98236ca4ccd..593a28a02cc47 100644
--- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java
+++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
@@ -46,6 +46,7 @@ import android.telephony.CellInfoGsm;
 import android.telephony.CellInfoLte;
 import android.telephony.CellInfoWcdma;
 import android.telephony.TelephonyManager;
+import android.util.Log;
 
 import com.android.internal.util.Protocol;
 import com.android.internal.util.State;
@@ -272,6 +273,11 @@ public class NetworkMonitor extends StateMachine {
         start();
     }
 
+    @Override
+    protected void log(String s) {
+        Log.d(TAG + mNetworkAgentInfo.name(), s);
+    }
+
     private class DefaultState extends State {
         @Override
         public boolean processMessage(Message message) {