am ba1311a3: Merge "Fix API name" into jb-mr2-dev

* commit 'ba1311a3f64efc9f22dea1ab5477002751e478dc':
  Fix API name

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();
     }

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);
 

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;
         }