Remove support for unused Hotspot 2.0 Release 2 APIs

am: 4bfade8d51

Change-Id: I786289cd355b62502387b8c7b0f3d8e01cc9a007

2 files changed, 0 insertions, 55 deletions

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 0d9f41390..20083f986 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -46,7 +46,6 @@ import android.net.NetworkUtils;
 import android.net.Uri;
 import android.net.ip.IpManager;
 import android.net.wifi.IWifiManager;
-import android.net.wifi.PasspointManagementObjectDefinition;
 import android.net.wifi.ScanResult;
 import android.net.wifi.ScanSettings;
 import android.net.wifi.WifiActivityEnergyInfo;
@@ -1083,27 +1082,6 @@ public class WifiServiceImpl extends IWifiManager.Stub {
     }
 
     /**
-     * Add a Hotspot 2.0 release 2 Management Object
-     * @param mo The MO in XML form
-     * @return -1 for failure
-     */
-    @Override
-    public int addPasspointManagementObject(String mo) {
-        return mWifiStateMachine.syncAddPasspointManagementObject(mWifiStateMachineChannel, mo);
-    }
-
-    /**
-     * Modify a Hotspot 2.0 release 2 Management Object
-     * @param fqdn The FQDN of the service provider
-     * @param mos A List of MO definitions to be updated
-     * @return the number of nodes updated, or -1 for failure
-     */
-    @Override
-    public int modifyPasspointManagementObject(String fqdn, List<PasspointManagementObjectDefinition> mos) {
-        return mWifiStateMachine.syncModifyPasspointManagementObject(mWifiStateMachineChannel, fqdn, mos);
-    }
-
-    /**
      * Query for a Hotspot 2.0 release 2 OSU icon
      * @param bssid The BSSID of the AP
      * @param fileName Icon file name
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 00b8648e4..8a8e4c6c8 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -59,7 +59,6 @@ import android.net.ip.IpManager;
 import android.net.wifi.IApInterface;
 import android.net.wifi.IClientInterface;
 import android.net.wifi.IWificond;
-import android.net.wifi.PasspointManagementObjectDefinition;
 import android.net.wifi.RssiPacketCountInfo;
 import android.net.wifi.ScanResult;
 import android.net.wifi.ScanSettings;
@@ -581,8 +580,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
     static final int CMD_RESET_SIM_NETWORKS                             = BASE + 101;
 
     /* OSU APIs */
-    static final int CMD_ADD_PASSPOINT_MO                               = BASE + 102;
-    static final int CMD_MODIFY_PASSPOINT_MO                            = BASE + 103;
     static final int CMD_QUERY_OSU_ICON                                 = BASE + 104;
 
     /* try to match a provider with current network */
@@ -1749,26 +1746,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
         }
     }
 
-    public int syncAddPasspointManagementObject(AsyncChannel channel, String managementObject) {
-        Message resultMsg =
-                channel.sendMessageSynchronously(CMD_ADD_PASSPOINT_MO, managementObject);
-        int result = resultMsg.arg1;
-        resultMsg.recycle();
-        return result;
-    }
-
-    public int syncModifyPasspointManagementObject(AsyncChannel channel, String fqdn,
-                                                   List<PasspointManagementObjectDefinition>
-                                                           managementObjectDefinitions) {
-        Bundle bundle = new Bundle();
-        bundle.putString("FQDN", fqdn);
-        bundle.putParcelableList("MOS", managementObjectDefinitions);
-        Message resultMsg = channel.sendMessageSynchronously(CMD_MODIFY_PASSPOINT_MO, bundle);
-        int result = resultMsg.arg1;
-        resultMsg.recycle();
-        return result;
-    }
-
     public boolean syncQueryPasspointIcon(AsyncChannel channel, long bssid, String fileName) {
         Bundle bundle = new Bundle();
         bundle.putLong(EXTRA_OSU_ICON_QUERY_BSSID, bssid);
@@ -3890,8 +3867,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
                 case CMD_USER_STOP:
                     mWifiConfigManager.handleUserStop(message.arg1);
                     break;
-                case CMD_ADD_PASSPOINT_MO:
-                case CMD_MODIFY_PASSPOINT_MO:
                 case CMD_QUERY_OSU_ICON:
                 case CMD_MATCH_PROVIDER_NETWORK:
                     /* reply with arg1 = 0 - it returns API failure to the calling app
@@ -5279,14 +5254,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
                     handleNetworkDisconnect();
                     transitionTo(mDisconnectedState);
                     break;
-                case CMD_ADD_PASSPOINT_MO:
-                    // TODO(b/31065385): Passpoint config management.
-                    replyToMessage(message, message.what, 0);
-                    break;
-                case CMD_MODIFY_PASSPOINT_MO:
-                    // TODO(b/31065385): Passpoint config management.
-                    replyToMessage(message, message.what, 0);
-                    break;
                 case CMD_QUERY_OSU_ICON:
                     mPasspointManager.queryPasspointIcon(
                             ((Bundle) message.obj).getLong(EXTRA_OSU_ICON_QUERY_BSSID),