Snap for 5885124 from f4e7c9b60591b7a9ef91201509d54bcae38f6e00 to qt-qpr1-release
Change-Id: I2775cad4a11e98fef22053fa0e3015be87c66063
diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java
index 8c52df7..aa5a1fd 100644
--- a/src/com/android/bluetooth/pan/PanService.java
+++ b/src/com/android/bluetooth/pan/PanService.java
@@ -27,7 +27,6 @@
import android.net.InterfaceConfiguration;
import android.net.LinkAddress;
import android.net.NetworkUtils;
-import android.os.Binder;
import android.os.Handler;
import android.os.IBinder;
import android.os.INetworkManagementService;
@@ -287,13 +286,14 @@
}
@Override
- public void setBluetoothTethering(boolean value) {
+ public void setBluetoothTethering(boolean value, String pkgName) {
PanService service = getService();
if (service == null) {
return;
}
- Log.d(TAG, "setBluetoothTethering: " + value + ", mTetherOn: " + service.mTetherOn);
- service.setBluetoothTethering(value);
+ Log.d(TAG, "setBluetoothTethering: " + value + ", pkgName: " + pkgName
+ + ", mTetherOn: " + service.mTetherOn);
+ service.setBluetoothTethering(value, pkgName);
}
@Override
@@ -362,22 +362,14 @@
return mTetherOn;
}
- void setBluetoothTethering(boolean value) {
+ void setBluetoothTethering(boolean value, final String pkgName) {
if (DBG) {
Log.d(TAG, "setBluetoothTethering: " + value + ", mTetherOn: " + mTetherOn);
}
enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");
final Context context = getBaseContext();
- String pkgName = context.getOpPackageName();
- // Clear caller identity temporarily so enforceTetherChangePermission UID checks work
- // correctly
- final long identityToken = Binder.clearCallingIdentity();
- try {
- ConnectivityManager.enforceTetherChangePermission(context, pkgName);
- } finally {
- Binder.restoreCallingIdentity(identityToken);
- }
+ ConnectivityManager.enforceTetherChangePermission(context, pkgName);
UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING) && value) {
