diff options
| author | Mitchell Wills <mwills@google.com> | 2016-06-16 17:18:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 17:18:54 +0000 |
| commit | a2f9a80b25772edfa6a8b4cb679202fc8e9154cd (patch) | |
| tree | 81ccaa4f5d595c4e45cc871025259da198bbae73 /service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | |
| parent | 051a0607b6b2f1ad058f048e2a104e4ebe36c730 (diff) | |
| parent | 8b35350228804aefa92f28125af4d78b3df1ed0d (diff) | |
| download | android_frameworks_opt_net_wifi-a2f9a80b25772edfa6a8b4cb679202fc8e9154cd.tar.gz android_frameworks_opt_net_wifi-a2f9a80b25772edfa6a8b4cb679202fc8e9154cd.tar.bz2 android_frameworks_opt_net_wifi-a2f9a80b25772edfa6a8b4cb679202fc8e9154cd.zip | |
Merge \\"Better distinguish between WifiScanner clients in logs\\" into nyc-mr1-dev am: b271c249de
am: 8b35350228
Change-Id: I8f827d683a15c285194b7e4a773368dd02e9d85e
Diffstat (limited to 'service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java')
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java index b29718db9..c36c7b121 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -136,7 +136,8 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { case AsyncChannel.CMD_CHANNEL_FULL_CONNECTION: { ExternalClientInfo client = (ExternalClientInfo) mClients.get(msg.replyTo); if (client != null) { - logw("duplicate client connection: " + msg.sendingUid); + logw("duplicate client connection: " + msg.sendingUid + ", messenger=" + + msg.replyTo); client.mChannel.replyToMessage(msg, AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED, AsyncChannel.STATUS_FULL_CONNECTION_REFUSED_ALREADY_CONNECTED); return; @@ -151,7 +152,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { ac.replyToMessage(msg, AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED, AsyncChannel.STATUS_SUCCESSFUL); - if (DBG) Log.d(TAG, "client connected: " + client); + localLog("client connected: " + client); return; } case AsyncChannel.CMD_CHANNEL_DISCONNECT: { @@ -164,9 +165,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { case AsyncChannel.CMD_CHANNEL_DISCONNECTED: { ExternalClientInfo client = (ExternalClientInfo) mClients.get(msg.replyTo); if (client != null) { - if (DBG) { - Log.d(TAG, "client disconnected: " + client + ", reason: " + msg.arg1); - } + localLog("client disconnected: " + client + ", reason: " + msg.arg1); client.cleanup(); } return; @@ -1117,13 +1116,13 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { if (DBG) Log.d(TAG, "scan stopped"); return true; } else { - Log.d(TAG, "starting scan: " + localLog("starting scan: " + "base period=" + schedule.base_period_ms + ", max ap per scan=" + schedule.max_ap_per_scan + ", batched scans=" + schedule.report_threshold_num_scans); for (int b = 0; b < schedule.num_buckets; b++) { WifiNative.BucketSettings bucket = schedule.buckets[b]; - Log.d(TAG, "bucket " + bucket.bucket + " (" + bucket.period_ms + "ms)" + localLog("bucket " + bucket.bucket + " (" + bucket.period_ms + "ms)" + "[" + bucket.report_events + "]: " + ChannelHelper.toString(bucket)); } @@ -1891,7 +1890,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { @Override public String toString() { - return "ClientInfo[uid=" + mUid + "]"; + return "ClientInfo[uid=" + mUid + "," + mMessenger + "]"; } } @@ -1988,6 +1987,11 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { public void sendRequestToClientHandler(int what) { sendRequestToClientHandler(what, null, null); } + + @Override + public String toString() { + return "InternalClientInfo[]"; + } } void replySucceeded(Message msg) { |