diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-04-19 15:56:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-19 15:56:11 +0000 |
| commit | ba1311a3f64efc9f22dea1ab5477002751e478dc (patch) | |
| tree | de8165ca332695d1f292f0b51f061b6cdf6de5db /wifi | |
| parent | 91695a0cdc0aaab3d3f939d9adb8855938b4f69d (diff) | |
| parent | 7ea33eac4b57aabf9326d60f52e3ed85217ac846 (diff) | |
| download | frameworks_base-ba1311a3f64efc9f22dea1ab5477002751e478dc.zip frameworks_base-ba1311a3f64efc9f22dea1ab5477002751e478dc.tar.gz frameworks_base-ba1311a3f64efc9f22dea1ab5477002751e478dc.tar.bz2 | |
Merge "Fix API name" into jb-mr2-dev
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 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index f093b52..547ae95 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -71,7 +71,7 @@ interface IWifiManager DhcpInfo getDhcpInfo(); - boolean isScanningAlwaysAvailable(); + boolean isScanAlwaysAvailable(); boolean acquireWifiLock(IBinder lock, int lockType, String tag, in WorkSource ws); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 0c0a144..a7a5924 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -794,9 +794,9 @@ public class WifiManager { * * To change this setting, see {@link #ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE}. */ - public boolean isScanningAlwaysAvailable() { + public boolean isScanAlwaysAvailable() { try { - return mService.isScanningAlwaysAvailable(); + return mService.isScanAlwaysAvailable(); } catch (RemoteException e) { return false; } |