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

Commit 2b8188a6 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Revert "HeadsetService: temporarily skip MODIFY_PHONE_STATE" 

This reverts commit 6d6a93fa.

Reason for revert: b/356478621 needed this skip  temporary

Change-Id: I86cb6dddc796458bd1610a5c6891350a2a81b42c
Test: None
Flag: Exempt, revert
Bug: 356478621
parent 6d6a93fa

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;
@@ -583,7 +582,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);
@@ -591,8 +589,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);

        }