diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-07 15:05:26 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-07 15:05:26 -0800 |
| commit | d528d48e5d8444de0730d62b9f621b9cc2df5fbd (patch) | |
| tree | 7efca1bf42b9eade8dae313e5a40f25e0f775a56 /wifi/java/android/net/wifi/IWifiManager.aidl | |
| parent | a5043fb4634904bc0deb925987f7bbc14a8ad035 (diff) | |
| parent | c3eef19047b897bfb6e3cf42220d5146b187c66e (diff) | |
| download | frameworks_base-d528d48e5d8444de0730d62b9f621b9cc2df5fbd.zip frameworks_base-d528d48e5d8444de0730d62b9f621b9cc2df5fbd.tar.gz frameworks_base-d528d48e5d8444de0730d62b9f621b9cc2df5fbd.tar.bz2 | |
resolved conflicts for merge of c3eef190 to master
Change-Id: I36fd3c7fcbb13e47e27ffc340484c03b5a553bb1
Diffstat (limited to 'wifi/java/android/net/wifi/IWifiManager.aidl')
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index bfcc208..4a6b1ff 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -115,7 +115,7 @@ interface IWifiManager void enableTdlsWithMacAddress(String remoteMacAddress, boolean enable); - boolean requestBatchedScan(in BatchedScanSettings requested, IBinder binder); + boolean requestBatchedScan(in BatchedScanSettings requested, IBinder binder, in WorkSource ws); void stopBatchedScan(in BatchedScanSettings requested); |