Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1311a3 authored Apr 19, 2013 by Irfan Sheriff Committed by Android (Google) Code Review Apr 19, 2013

Merge "Fix API name" into jb-mr2-dev

parents 91695a0c 7ea33eac

services/java/com/android/server/wifi/WifiService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}