WARNING: New clients should not use this function. The only usages should be in PanService + * and WifiStateMachine which need direct access. All other clients should use + * {@link #startTethering} and {@link #stopTethering} which encapsulate proper provisioning + * logic.
+ * * @param iface the interface name to tether. * @return error a {@code TETHER_ERROR} value indicating success or failure type * @@ -1810,6 +1883,11 @@ public class ConnectivityManager { * or the ability to modify system settings as determined by * {@link android.provider.Settings.System#canWrite}. * + *WARNING: New clients should not use this function. The only usages should be in PanService + * and WifiStateMachine which need direct access. All other clients should use + * {@link #startTethering} and {@link #stopTethering} which encapsulate proper provisioning + * logic.
+ * * @param iface the interface name to untether. * @return error a {@code TETHER_ERROR} value indicating success or failure type * @@ -1834,6 +1912,7 @@ public class ConnectivityManager { * * {@hide} */ + @SystemApi public boolean isTetheringSupported() { try { return mService.isTetheringSupported(); @@ -1842,6 +1921,94 @@ public class ConnectivityManager { } } + /** + * Callback for use with {@link #startTethering} to find out whether tethering succeeded. + * @hide + */ + @SystemApi + public static abstract class OnStartTetheringCallback { + /** + * Called when tethering has been successfully started. + */ + public void onTetheringStarted() {}; + + /** + * Called when starting tethering failed. + */ + public void onTetheringFailed() {}; + } + + /** + * Convenient overload for + * {@link #startTethering(int, boolean, OnStartTetheringCallback, Handler)} which passes a null + * handler to run on the current thread's {@link Looper}. + * @hide + */ + @SystemApi + public void startTethering(int type, boolean showProvisioningUi, + final OnStartTetheringCallback callback) { + startTethering(type, showProvisioningUi, callback, null); + } + + /** + * Runs tether provisioning for the given type if needed and then starts tethering if + * the check succeeds. If no carrier provisioning is required for tethering, tethering is + * enabled immediately. If provisioning fails, tethering will not be enabled. It also + * schedules tether provisioning re-checks if appropriate. + * + * @param type The type of tethering to start. Must be one of + * {@link ConnectivityManager.TETHERING_WIFI}, + * {@link ConnectivityManager.TETHERING_USB}, or + * {@link ConnectivityManager.TETHERING_BLUETOOTH}. + * @param showProvisioningUi a boolean indicating to show the provisioning app UI if there + * is one. This should be true the first time this function is called and also any time + * the user can see this UI. It gives users information from their carrier about the + * check failing and how they can sign up for tethering if possible. + * @param callback an {@link OnStartTetheringCallback} which will be called to notify the caller + * of the result of trying to tether. + * @param handler {@link Handler} to specify the thread upon which the callback will be invoked. + * @hide + */ + @SystemApi + public void startTethering(int type, boolean showProvisioningUi, + final OnStartTetheringCallback callback, Handler handler) { + ResultReceiver wrappedCallback = new ResultReceiver(handler) { + @Override + protected void onReceiveResult(int resultCode, Bundle resultData) { + if (resultCode == TETHER_ERROR_NO_ERROR) { + callback.onTetheringStarted(); + } else { + callback.onTetheringFailed(); + } + } + }; + try { + mService.startTethering(type, wrappedCallback, showProvisioningUi); + } catch (RemoteException e) { + Log.e(TAG, "Exception trying to start tethering.", e); + wrappedCallback.send(TETHER_ERROR_SERVICE_UNAVAIL, null); + } + } + + /** + * Stops tethering for the given type. Also cancels any provisioning rechecks for that type if + * applicable. + * + * @param type The type of tethering to stop. Must be one of + * {@link ConnectivityManager.TETHERING_WIFI}, + * {@link ConnectivityManager.TETHERING_USB}, or + * {@link ConnectivityManager.TETHERING_BLUETOOTH}. + * @hide + */ + @SystemApi + public void stopTethering(int type) { + try { + mService.stopTethering(type); + } catch (RemoteException e) { + Log.e(TAG, "Exception trying to stop tethering.", e); + } + } + /** * Get the list of regular expressions that define any tetherable * USB network interfaces. If USB tethering is not supported by the @@ -1949,6 +2116,8 @@ public class ConnectivityManager { public static final int TETHER_ERROR_DISABLE_NAT_ERROR = 9; /** {@hide} */ public static final int TETHER_ERROR_IFACE_CFG_ERROR = 10; + /** {@hide} */ + public static final int TETHER_ERROR_PROVISION_FAILED = 11; /** * Get a more detailed error code after a Tethering or Untethering diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 569468e196..1a9c9ea4eb 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -76,6 +76,10 @@ interface IConnectivityManager boolean isTetheringSupported(); + void startTethering(int type, in ResultReceiver receiver, boolean showProvisioningUi); + + void stopTethering(int type); + String[] getTetherableIfaces(); String[] getTetheredIfaces(); diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 9927fd6c55..3c13630dd8 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -87,6 +87,7 @@ import android.os.ParcelFileDescriptor; import android.os.PowerManager; import android.os.Process; import android.os.RemoteException; +import android.os.ResultReceiver; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; @@ -2686,6 +2687,21 @@ public class ConnectivityService extends IConnectivityManager.Stub mTethering.getUpstreamIfaceTypes().length != 0); } + public void startTethering(int type, ResultReceiver receiver, + boolean showProvisioningUi) { + ConnectivityManager.enforceTetherChangePermission(mContext); + if (!isTetheringSupported()) { + receiver.send(ConnectivityManager.TETHER_ERROR_UNSUPPORTED, null); + return; + } + mTethering.startTethering(type, receiver, showProvisioningUi); + } + + public void stopTethering(int type) { + ConnectivityManager.enforceTetherChangePermission(mContext); + mTethering.stopTethering(type); + } + // Called when we lose the default network and have no replacement yet. // This will automatically be cleared after X seconds or a new default network // becomes CONNECTED, whichever happens first. The timer is started by the