Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c8fac66 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Pipe through attributionTag though bt app 

Test: TH
Bug: 136595429
Change-Id: I103c5c0850563bcc3ecf6d781386a495a1921efc
Merged-In: I502724692bc52e3113a62960cccda5eb1ecd4f99
Exempt-From-Owner-Approval: 1:1 cherry-pick
parent fcfd6a1f

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

+5 −4
Original line number Diff line number Diff line
@@ -298,14 +298,14 @@ public class PanService extends ProfileService { 
        }



        @Override

        public void setBluetoothTethering(boolean value, String pkgName) {

        public void setBluetoothTethering(boolean value, String pkgName, String attributionTag) {

            PanService service = getService();

            if (service == null) {

                return;

            }

            Log.d(TAG, "setBluetoothTethering: " + value + ", pkgName: " + pkgName

                    + ", mTetherOn: " + service.mTetherOn);

            service.setBluetoothTethering(value, pkgName);

            service.setBluetoothTethering(value, pkgName, attributionTag);

        }



        @Override
@@ -378,7 +378,8 @@ public class PanService extends ProfileService { 
        return mTetherOn;

    }



    void setBluetoothTethering(boolean value, final String pkgName) {

    void setBluetoothTethering(boolean value, final String pkgName,

            final String callingAttributionTag) {

        if (DBG) {

            Log.d(TAG, "setBluetoothTethering: " + value + ", mTetherOn: " + mTetherOn);

        }
@@ -386,7 +387,7 @@ public class PanService extends ProfileService { 
                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        final Context context = getBaseContext();



        ConnectivityManager.enforceTetherChangePermission(context, pkgName);

        ConnectivityManager.enforceTetherChangePermission(context, pkgName, callingAttributionTag);



        UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);

        if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING) && value) {