2 files changed, 59 insertions, 8 deletions

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 00cdc71..b2af044 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -152,17 +152,20 @@ interface IWifiManager
 
     int getVerboseLoggingLevel();
 
-    int getAggressiveHandover();
-
     void enableAggressiveHandover(int enabled);
+    int getAggressiveHandover();
 
+    void setAllowScansWithTraffic(int enabled);
     int getAllowScansWithTraffic();
 
-    void setAllowScansWithTraffic(int enabled);
+    void setAllowScansWhileAssociated(int enabled);
+    int getAllowScansWhileAssociated();
 
-    boolean getAllowScansWhileAssociated();
+    void setAllowNetworkSwitchingWhileAssociated(int enabled);
+    int getAllowNetworkSwitchingWhileAssociated();
 
-    void setAllowScansWhileAssociated(boolean enabled);
+    void setHalBasedAutojoinOffload(int enabled);
+    int getHalBasedAutojoinOffload();
 
     WifiConnectionStatistics getConnectionStatistics();
 
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index a2b1858..f2c2a28 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -2773,7 +2773,7 @@ public class WifiManager {
      * Set setting for allowing Scans when infrastructure is associated
      * @hide
      */
-    public void setAllowScansWhileAssociated(boolean enabled) {
+    public void setAllowScansWhileAssociated(int enabled) {
         try {
             mService.setAllowScansWhileAssociated(enabled);
         } catch (RemoteException e) {
@@ -2785,12 +2785,12 @@ public class WifiManager {
      * Get setting for allowing Scans when infrastructure is associated
      * @hide
      */
-    public boolean getAllowScansWhileAssociated() {
+    public int getAllowScansWhileAssociated() {
         try {
             return mService.getAllowScansWhileAssociated();
         } catch (RemoteException e) {
         }
-        return false;
+        return 0;
     }
 
     /**
@@ -2817,4 +2817,52 @@ public class WifiManager {
             return null;
         }
     }
+
+    /**
+     * Set setting for enabling autojoin Offload thru Wifi HAL layer
+     * @hide
+     */
+    public void setHalBasedAutojoinOffload(int enabled) {
+        try {
+            mService.setHalBasedAutojoinOffload(enabled);
+        } catch (RemoteException e) {
+
+        }
+    }
+
+    /**
+     * Get setting for enabling autojoin Offload thru Wifi HAL layer
+     * @hide
+     */
+    public int getHalBasedAutojoinOffload() {
+        try {
+            return mService.getHalBasedAutojoinOffload();
+        } catch (RemoteException e) {
+        }
+        return 0;
+    }
+
+    /**
+     * Set setting for enabling network switching while wifi is associated
+     * @hide
+     */
+    public void setAllowNetworkSwitchingWhileAssociated(int enabled) {
+        try {
+            mService.setAllowNetworkSwitchingWhileAssociated(enabled);
+        } catch (RemoteException e) {
+
+        }
+    }
+
+    /**
+     * Get setting for enabling network switching while wifi is associated
+     * @hide
+     */
+    public int getAllowNetworkSwitchingWhileAssociated() {
+        try {
+            return mService.getAllowNetworkSwitchingWhileAssociated();
+        } catch (RemoteException e) {
+        }
+        return 0;
+    }
 }