diff options
| -rw-r--r-- | services/java/com/android/server/wifi/WifiService.java | 4 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/services/java/com/android/server/wifi/WifiService.java b/services/java/com/android/server/wifi/WifiService.java index 4d23e5c..9560199 100644 --- a/services/java/com/android/server/wifi/WifiService.java +++ b/services/java/com/android/server/wifi/WifiService.java @@ -404,7 +404,7 @@ public final class WifiService extends IWifiManager.Stub { try { /* Turning off Wi-Fi when scans are still available */ - if (!enable && isScanningAlwaysAvailable()) { + if (!enable && isScanAlwaysAvailable()) { /* Notify if device is provisioned and user has not opted out of the notification */ if (mNotifyScanMode.get() && mDeviceProvisioned.get()) { Intent intent = new Intent(WifiManager.ACTION_NOTIFY_SCAN_ALWAYS_AVAILABLE); @@ -497,7 +497,7 @@ public final class WifiService extends IWifiManager.Stub { * @return {@code true} if the enable/disable operation was * started or is already in the queue. */ - public boolean isScanningAlwaysAvailable() { + public boolean isScanAlwaysAvailable() { enforceAccessPermission(); return mSettingsStore.isScanAlwaysAvailable(); } 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; } |