diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-07-23 19:36:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-23 19:36:32 -0700 |
| commit | 5db7af968a5b57ad9f8e5a61534cafe46c344b85 (patch) | |
| tree | 08d0f4b5b8f1f6094cf8b39be2207e612cb20672 /core/java/android | |
| parent | ab45c768bcfecbabbd664d4962f0c86627b6c76b (diff) | |
| parent | 6c2260b3af3a9243aa7f04cf03106f31817cb4c1 (diff) | |
| download | frameworks_base-5db7af968a5b57ad9f8e5a61534cafe46c344b85.zip frameworks_base-5db7af968a5b57ad9f8e5a61534cafe46c344b85.tar.gz frameworks_base-5db7af968a5b57ad9f8e5a61534cafe46c344b85.tar.bz2 | |
Merge "Fix USB tethering"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 11 | ||||
| -rw-r--r-- | core/java/android/net/IConnectivityManager.aidl | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index ce6f697..a564d97 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -653,6 +653,17 @@ public class ConnectivityManager { } } + /** + * {@hide} + */ + public int setUsbTethering(boolean enable) { + try { + return mService.setUsbTethering(enable); + } catch (RemoteException e) { + return TETHER_ERROR_SERVICE_UNAVAIL; + } + } + /** {@hide} */ public static final int TETHER_ERROR_NO_ERROR = 0; /** {@hide} */ diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index d95fc8d..b1d99a4 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -88,6 +88,8 @@ interface IConnectivityManager String[] getTetherableBluetoothRegexs(); + int setUsbTethering(boolean enable); + void requestNetworkTransitionWakelock(in String forWhom); void reportInetCondition(int networkType, int percentage); |