Merge "Obsolete a couple of auto-join related APIs." into nyc-dev (ee944867) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/IWifiManager.aidl

+0 −3

Original line number	Diff line number	Diff line
		@@ -149,9 +149,6 @@ interface IWifiManager
		void setAllowScansWithTraffic(int enabled);
		int getAllowScansWithTraffic();

		void setHalBasedAutojoinOffload(int enabled);
		int getHalBasedAutojoinOffload();

		boolean enableAutoJoinWhenAssociated(boolean enabled);
		boolean getEnableAutoJoinWhenAssociated();

+0 −25

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.net.NetworkRequest;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.IBinder;
		import android.os.Looper;
		import android.os.Message;
		@@ -43,7 +42,6 @@ import com.android.internal.util.Protocol;
		import com.android.server.net.NetworkPinner;

		import java.net.InetAddress;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.concurrent.CountDownLatch;

		@@ -2721,27 +2719,4 @@ public class WifiManager {
		throw e.rethrowFromSystemServer();
		}
		}
		/**
		* Set setting for enabling autojoin Offload thru Wifi HAL layer
		* @hide
		*/
		public void setHalBasedAutojoinOffload(int enabled) {
		try {
		mService.setHalBasedAutojoinOffload(enabled);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Get setting for enabling autojoin Offload thru Wifi HAL layer
		* @hide
		*/
		public int getHalBasedAutojoinOffload() {
		try {
		return mService.getHalBasedAutojoinOffload();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}