LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Do not throw on call to isTetheringSupported w/o permission" into oc-mr1-dev

Browse Source 
am: e545f00e10

Change-Id: Ib5b17a7f68c1327f47fe1f54c0454c51f4226907
This commit is contained in:
Chalard Jean
2017-09-27 02:12:24 +00:00
committed by android-build-merger
parent 883604a9fd ffacaef813
commit 8522ec6dcc
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/net/ConnectivityManager.java
View File

@@ -2078,16 +2078,30 @@ public class ConnectivityManager {
* {@code ro.tether.denied} system property, Settings.TETHER_SUPPORTED or
* due to device configuration.
*
* <p>If this app does not have permission to use this API, it will always
* return false rather than throw an exception.</p>
*
* <p>If the device has a hotspot provisioning app, the caller is required to hold the
* {@link android.Manifest.permission.TETHER_PRIVILEGED} permission.</p>
*
* <p>Otherwise, this method requires the caller to hold the ability to modify system
* settings as determined by {@link android.provider.Settings.System#canWrite}.</p>
*
* @return a boolean - {@code true} indicating Tethering is supported.
*
* {@hide}
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED)
@RequiresPermission(anyOf = {android.Manifest.permission.TETHER_PRIVILEGED,
android.Manifest.permission.WRITE_SETTINGS})
public boolean isTetheringSupported() {
try {
String pkgName = mContext.getOpPackageName();
try {
return mService.isTetheringSupported(pkgName);
} catch (SecurityException e) {
// This API is not available to this caller, but for backward-compatibility
// this will just return false instead of throwing.
return false;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}