diff options
| author | Mark Chien <markchien@google.com> | 2020-06-11 08:03:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-11 08:03:56 +0000 |
| commit | f8bca221adc3d154059a1e88d100af015de15eb3 (patch) | |
| tree | 15c51c42908e937f919cc13790b09ed66df631c4 /core/java/android/net/ConnectivityManager.java | |
| parent | 1ac0fb69ac09a41af1c50de78d2485015008c195 (diff) | |
| parent | e0f4e04f5cf199d8515cab74e4c4437a8dc75c73 (diff) | |
Merge "Cleanup config_mobile_hotspot_provision_app usage" am: 443092b9a8 am: e0f4e04f5c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329014
Change-Id: Ib3bb0129419ffd55df6c2c53cce3ad7e9155e854
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 5277ff6093c9..fd62acfe6ba8 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2270,27 +2270,6 @@ public class ConnectivityManager { throwException); } - /** {@hide} */ - public static final void enforceTetherChangePermission(Context context, String callingPkg, - String callingAttributionTag) { - Preconditions.checkNotNull(context, "Context cannot be null"); - Preconditions.checkNotNull(callingPkg, "callingPkg cannot be null"); - - if (context.getResources().getStringArray( - com.android.internal.R.array.config_mobile_hotspot_provision_app).length == 2) { - // Have a provisioning app - must only let system apps (which check this app) - // turn on tethering - context.enforceCallingOrSelfPermission( - android.Manifest.permission.TETHER_PRIVILEGED, "ConnectivityService"); - } else { - int uid = Binder.getCallingUid(); - // If callingPkg's uid is not same as Binder.getCallingUid(), - // AppOpsService throws SecurityException. - checkAndNoteWriteSettingsOperation(context, uid, callingPkg, - callingAttributionTag, true /* throwException */); - } - } - /** * Check if the package is a allowed to write settings. This also accounts that such an access * happened. |