From 82f4218c0d5dbc10404db8cf31f0284140d80175 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Thu, 19 Sep 2013 17:27:43 -0700 Subject: Cleanup the shutdown of BatchedScans. Fixes binder-death as well as disambiguation when an app has multiple requests in. bug:10641931 Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923 --- wifi/java/android/net/wifi/IWifiManager.aidl | 2 +- wifi/java/android/net/wifi/WifiManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'wifi/java/android') 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 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) {} } -- cgit v1.1