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

Commit 0604ee76 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

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

parents 006e42a3 2b8188a6

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

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

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadset;

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

        }





        @Override

        @Override

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

        public boolean setConnectionPolicy(

        public boolean setConnectionPolicy(

                BluetoothDevice device, int connectionPolicy, AttributionSource source) {

                BluetoothDevice device, int connectionPolicy, AttributionSource source) {

            HeadsetService service = getService(source);

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

                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);

            service.enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, null);

            return service.setConnectionPolicy(device, connectionPolicy);

            return service.setConnectionPolicy(device, connectionPolicy);

        }

        }