diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-09-19 17:27:43 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-09-20 16:32:47 +0000 |
| commit | 82f4218c0d5dbc10404db8cf31f0284140d80175 (patch) | |
| tree | d325d36dac6fee99c31ac4819c3e086a73245eda /wifi | |
| parent | 8f435baca8b5285a6b4658fc9563f5fcbbdafc6e (diff) | |
| download | frameworks_base-82f4218c0d5dbc10404db8cf31f0284140d80175.zip frameworks_base-82f4218c0d5dbc10404db8cf31f0284140d80175.tar.gz frameworks_base-82f4218c0d5dbc10404db8cf31f0284140d80175.tar.bz2 | |
Cleanup the shutdown of BatchedScans.
Fixes binder-death as well as disambiguation when an app has multiple requests in.
bug:10641931
Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923
Diffstat (limited to 'wifi')
| -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 c3bf9c1..31bc1ff 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) {} } |