diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-09-20 17:43:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-20 17:43:30 +0000 |
| commit | 540784f903c8a9e808ef88d14fe5e1227bda4561 (patch) | |
| tree | 2d95b229ff17eac918b95047ca4b98577ba56df4 /wifi/java/android | |
| parent | 562ce888af21fc18d1610545ff6373ee2ecbbb13 (diff) | |
| parent | 82f4218c0d5dbc10404db8cf31f0284140d80175 (diff) | |
| download | frameworks_base-540784f903c8a9e808ef88d14fe5e1227bda4561.zip frameworks_base-540784f903c8a9e808ef88d14fe5e1227bda4561.tar.gz frameworks_base-540784f903c8a9e808ef88d14fe5e1227bda4561.tar.bz2 | |
Merge "Cleanup the shutdown of BatchedScans." into klp-dev
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 4f68ca0..5a1928c 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -119,7 +119,7 @@ interface IWifiManager boolean requestBatchedScan(in BatchedScanSettings requested, IBinder binder); - void stopBatchedScan(in BatchedScanSettings requested, IBinder binder); + void stopBatchedScan(in BatchedScanSettings requested); List<BatchedScanResult> getBatchedScanResults(String callingPackage); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 3223cb3..95ee85b 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -826,7 +826,7 @@ public class WifiManager { */ public void stopBatchedScan(BatchedScanSettings requested) { try { - mService.stopBatchedScan(requested, new Binder()); + mService.stopBatchedScan(requested); } catch (RemoteException e) {} } |