diff options
author | Mitchell Wills <mwills@google.com> | 2016-05-20 11:36:20 -0700 |
---|---|---|
committer | Mitchell Wills <mwills@google.com> | 2016-05-20 11:54:55 -0700 |
commit | 56820e92fd4b1a0cee83f552905fc76fc8290146 (patch) | |
tree | ea15ed55246f8e7e88322efc89cbcda68257ffc0 /service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | |
parent | 1bf155710ada7a6ee27453a120690d2c91a0fec5 (diff) | |
download | android_frameworks_opt_net_wifi-56820e92fd4b1a0cee83f552905fc76fc8290146.tar.gz android_frameworks_opt_net_wifi-56820e92fd4b1a0cee83f552905fc76fc8290146.tar.bz2 android_frameworks_opt_net_wifi-56820e92fd4b1a0cee83f552905fc76fc8290146.zip |
Make sure that all ways a scan can fail get logged
Bug: 28682351
Change-Id: If9296d862adbd479e8600699f06f4684d377ae6a
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 76bff29c7..55d7c2099 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -534,8 +534,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; } @@ -544,7 +546,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 @@ -553,6 +555,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); @@ -726,6 +729,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)); } |