Merge "Obsolete a couple of auto-join related APIs." into nyc-dev

am: ee94486

* commit 'ee94486742fe21ca23852bdd3cd7a13bb9363056':
  Obsolete a couple of auto-join related APIs.

Change-Id: I74b92f8168272b912f8bcfdca095a0c61f2d7b21

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

@@ -149,9 +149,6 @@ interface IWifiManager
     void setAllowScansWithTraffic(int enabled);
     int getAllowScansWithTraffic();
 
-    void setHalBasedAutojoinOffload(int enabled);
-    int getHalBasedAutojoinOffload();
-
     boolean enableAutoJoinWhenAssociated(boolean enabled);
     boolean getEnableAutoJoinWhenAssociated();
 

wifi/java/android/net/wifi/WifiManager.java

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