diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-09-20 11:22:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-20 11:22:35 -0700 |
| commit | 692af53a20772150a1715a4f48c660d9de0ef851 (patch) | |
| tree | 20483cdd03a31fc935e73ca0e7c27e5bfd27c980 /wifi | |
| parent | 0216929e19e7e89d082b11a56687865586a552f6 (diff) | |
| parent | eccc0905bd150a334a98efedfb08570bcdd1c31a (diff) | |
| download | frameworks_base-692af53a20772150a1715a4f48c660d9de0ef851.zip frameworks_base-692af53a20772150a1715a4f48c660d9de0ef851.tar.gz frameworks_base-692af53a20772150a1715a4f48c660d9de0ef851.tar.bz2 | |
am eccc0905: am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev
* commit 'eccc0905bd150a334a98efedfb08570bcdd1c31a':
Cleanup the shutdown of BatchedScans.
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 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) {} } |