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

Commit da538fa2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "HeadsetService: temporarily skip MODIFY_PHONE_STATE" into main

parents 1cc4b175 6d6a93fa

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

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 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;
@@ -581,6 +582,7 @@ 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);
@@ -588,7 +590,8 @@ public class HeadsetService extends ProfileService { 
                return false;

            }



            service.enforceCallingOrSelfPermission(MODIFY_PHONE_STATE, null);

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

            // service.enforceCallingOrSelfPermission(MODIFY_PHONE_STATE, null);

            service.enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, null);

            return service.setConnectionPolicy(device, connectionPolicy);

        }