diff options
author | Mitchell Wills <mwills@google.com> | 2016-05-23 16:26:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-23 16:26:13 +0000 |
commit | 1f9f7c109ca952884fb7bff7271669d879ce9b97 (patch) | |
tree | f4d37e3c1e3dafe832d7b43fe6d5d1d4ecf0514f /service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | |
parent | 9d6a7a1b5f9e9ea194fc6b15044c9d14d6aefabf (diff) | |
parent | 56820e92fd4b1a0cee83f552905fc76fc8290146 (diff) | |
download | android_frameworks_opt_net_wifi-1f9f7c109ca952884fb7bff7271669d879ce9b97.tar.gz android_frameworks_opt_net_wifi-1f9f7c109ca952884fb7bff7271669d879ce9b97.tar.bz2 android_frameworks_opt_net_wifi-1f9f7c109ca952884fb7bff7271669d879ce9b97.zip |
Merge "Make sure that all ways a scan can fail get logged" into nyc-dev
Diffstat (limited to 'service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java')
-rw-r--r-- | service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java index b732a6e77..a82ce1f25 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -535,8 +535,10 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { switch (msg.what) { case WifiScanner.CMD_START_SINGLE_SCAN: mWifiMetrics.incrementOneshotScanCount(); + int handler = msg.arg2; Bundle scanParams = (Bundle) msg.obj; if (scanParams == null) { + logCallback("singleScanInvalidRequest", ci, handler, "null params"); replyFailed(msg, WifiScanner.REASON_INVALID_REQUEST, "params null"); return HANDLED; } @@ -545,7 +547,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { scanParams.getParcelable(WifiScanner.SCAN_PARAMS_SCAN_SETTINGS_KEY); WorkSource workSource = scanParams.getParcelable(WifiScanner.SCAN_PARAMS_WORK_SOURCE_KEY); - if (validateAndAddToScanQueue(ci, msg.arg2, scanSettings, workSource)) { + if (validateAndAddToScanQueue(ci, handler, scanSettings, workSource)) { replySucceeded(msg); // If were not currently scanning then try to start a scan. Otherwise // this scan will be scheduled when transitioning back to IdleState @@ -554,6 +556,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { tryToStartNewScan(); } } else { + logCallback("singleScanInvalidRequest", ci, handler, "bad request"); replyFailed(msg, WifiScanner.REASON_INVALID_REQUEST, "bad request"); mWifiMetrics.incrementScanReturnEntry( WifiMetricsProto.WifiLog.SCAN_FAILURE_INVALID_CONFIGURATION, 1); @@ -727,6 +730,8 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { void sendOpFailedToAllAndClear(RequestList<?> clientHandlers, int reason, String description) { for (RequestInfo<?> entry : clientHandlers) { + logCallback("singleScanFailed", entry.clientInfo, entry.handlerId, + "reason=" + reason + ", " + description); entry.reportEvent(WifiScanner.CMD_OP_FAILED, 0, new WifiScanner.OperationResult(reason, description)); } |