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

Commit d807308d authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Revert "HeadsetService: temporarily skip MODIFY_PHONE_STATE"" into main... 

Merge "Revert "HeadsetService: temporarily skip MODIFY_PHONE_STATE"" into main am: 0604ee76 am: 0ade825d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3234543



Change-Id: Id15bad714ad63da1dfd7bdd629e1b82b5d0cbfb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9cb06f3e 0ade825d

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+1 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static java.util.Objects.requireNonNull; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadset;
@@ -582,7 +581,6 @@ public class HeadsetService extends ProfileService { 
        }



        @Override

        @SuppressLint("AndroidFrameworkRequiresPermission") // TODO: b/356478621 - remove

        public boolean setConnectionPolicy(

                BluetoothDevice device, int connectionPolicy, AttributionSource source) {

            HeadsetService service = getService(source);
@@ -590,8 +588,7 @@ public class HeadsetService extends ProfileService { 
                return false;

            }



            // TODO: b/356478621 - put back the permission check

            // service.enforceCallingOrSelfPermission(MODIFY_PHONE_STATE, null);

            service.enforceCallingOrSelfPermission(MODIFY_PHONE_STATE, null);

            service.enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, null);

            return service.setConnectionPolicy(device, connectionPolicy);

        }