diff options
author | Mike Lockwood <lockwood@android.com> | 2011-06-08 15:10:26 -0700 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2011-06-19 20:50:46 -0400 |
commit | 3c2a2f6789ee257e3838ffb0f3f117e08825ad5f (patch) | |
tree | 5d4658b7437d3ba3a13498535fb6afe891d7d13e /services/java/com/android/server/NetworkManagementService.java | |
parent | 75a0e9c0f076093368ca50ac7e905a48af919f8b (diff) | |
download | frameworks_base-3c2a2f6789ee257e3838ffb0f3f117e08825ad5f.zip frameworks_base-3c2a2f6789ee257e3838ffb0f3f117e08825ad5f.tar.gz frameworks_base-3c2a2f6789ee257e3838ffb0f3f117e08825ad5f.tar.bz2 |
Tethering: Use UsbManager to enable/disable RNDIS
Remove obsolete RNDIS support from NetworkManagementService
This change fixes USB tethering, which broke after the new USB gadget driver
changes went in.
Change-Id: Idd987fb2c39c40e81ebc92e6d8dae9fe77ed4ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services/java/com/android/server/NetworkManagementService.java')
-rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index d5bdd21..9c73a5d 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -78,7 +78,6 @@ class NetworkManagementService extends INetworkManagementService.Stub { public static final int IpFwdStatusResult = 211; public static final int InterfaceGetCfgResult = 213; public static final int SoftapStatusResult = 214; - public static final int UsbRNDISStatusResult = 215; public static final int InterfaceRxCounterResult = 216; public static final int InterfaceTxCounterResult = 217; public static final int InterfaceRxThrottleResult = 218; @@ -718,52 +717,6 @@ class NetworkManagementService extends INetworkManagementService.Stub { } } - public void startUsbRNDIS() throws IllegalStateException { - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService"); - try { - mConnector.doCommand("usb startrndis"); - } catch (NativeDaemonConnectorException e) { - throw new IllegalStateException( - "Error communicating to native daemon for starting RNDIS", e); - } - } - - public void stopUsbRNDIS() throws IllegalStateException { - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService"); - try { - mConnector.doCommand("usb stoprndis"); - } catch (NativeDaemonConnectorException e) { - throw new IllegalStateException("Error communicating to native daemon", e); - } - } - - public boolean isUsbRNDISStarted() throws IllegalStateException { - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.ACCESS_NETWORK_STATE, "NetworkManagementService"); - ArrayList<String> rsp; - try { - rsp = mConnector.doCommand("usb rndisstatus"); - } catch (NativeDaemonConnectorException e) { - throw new IllegalStateException( - "Error communicating to native daemon to check RNDIS status", e); - } - - for (String line : rsp) { - String []tok = line.split(" "); - int code = Integer.parseInt(tok[0]); - if (code == NetdResponseCode.UsbRNDISStatusResult) { - if (tok[3].equals("started")) - return true; - return false; - } else { - throw new IllegalStateException(String.format("Unexpected response code %d", code)); - } - } - throw new IllegalStateException("Got an empty response"); - } - public void startAccessPoint(WifiConfiguration wifiConfig, String wlanIface, String softapIface) throws IllegalStateException { mContext.enforceCallingOrSelfPermission( |