am 78a853d1: am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev

* commit '78a853d17a33958ebc7d014cc6ec3998696302d3':
  Fix NetworkMonitor logging to include NetID.
This commit is contained in:
Paul Jensen
2014-11-10 17:36:56 +00:00
committed by Android Git Automerger

View File

@@ -46,6 +46,7 @@ import android.telephony.CellInfoGsm;
import android.telephony.CellInfoLte; import android.telephony.CellInfoLte;
import android.telephony.CellInfoWcdma; import android.telephony.CellInfoWcdma;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.internal.util.Protocol; import com.android.internal.util.Protocol;
import com.android.internal.util.State; import com.android.internal.util.State;
@@ -272,6 +273,11 @@ public class NetworkMonitor extends StateMachine {
start(); start();
} }
@Override
protected void log(String s) {
Log.d(TAG + mNetworkAgentInfo.name(), s);
}
private class DefaultState extends State { private class DefaultState extends State {
@Override @Override
public boolean processMessage(Message message) { public boolean processMessage(Message message) {