commit 449f26b7516abb02012d469828da737408be51db
author markchien <markchien@google.com> Wed Jun 03 23:17:25 2020 +0800
committer markchien <markchien@google.com> Wed Jun 10 22:31:52 2020 +0800
tree dd462dc5c6d995772a6d612c0f0c6bb92711bfdb
parent 47fbdb02de8de72f3a140659a0b0df84b0561a45

Check TETHER_PRIVILEGED permission directly in PanService

Originally #setBluetoothTethering always checked the tethering permissions,
but then in R it also check BLUETOOTH_PRIVILEGED as well. And given that
BLUETOOTH_PRIVILEGED is privileged permission and can't be held by third
party apps (and because this method is only intended to be called by
tethering), it's probably not necessary to have another permission check,
but for extra safety, keep check TETHER_PRIVILEGED as well.

Bug: 146918263
Test: m
Change-Id: I336ec412728e897f735249871dba90d9986a4047
Merged-In: I336ec412728e897f735249871dba90d9986a4047

src/com/android/bluetooth/pan/PanService.java

diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java
index 28943b3..c6e89a8 100644
--- a/src/com/android/bluetooth/pan/PanService.java
+++ b/src/com/android/bluetooth/pan/PanService.java
@@ -16,6 +16,8 @@
 
 package com.android.bluetooth.pan;
 
+import static android.Manifest.permission.TETHER_PRIVILEGED;
+
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothPan.LocalPanRole;
@@ -396,9 +398,8 @@
         }
         enforceCallingOrSelfPermission(
                 BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
-        final Context context = getBaseContext();
-
-        ConnectivityManager.enforceTetherChangePermission(context, pkgName);
+        enforceCallingOrSelfPermission(
+                TETHER_PRIVILEGED, "Need TETHER_PRIVILEGED permission");
 
         UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
         if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING) && value) {