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

Commit b7cb4c52 authored by Treehugger Robot's avatar Treehugger Robot Committed by android-build-merger
Browse files

Merge "HFP: Fix typo in various permission check messages" 

am: 9b4361a1

Change-Id: I8440e821444b06f2b9d310de197d7fd82a54f448
parents 33bd7e92 9b4361a1

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

+4 −4
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ public class HeadsetService extends ProfileService { 
    }



    boolean disconnect(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH ADMIN permission");

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        synchronized (mStateMachines) {

            Log.i(TAG, "disconnect: device=" + device);

            HeadsetStateMachine stateMachine = mStateMachines.get(device);
@@ -946,7 +946,7 @@ public class HeadsetService extends ProfileService { 
     * @return the active device or null if no device is active

     */

    public BluetoothDevice getActiveDevice() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH_PERM permission");

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        synchronized (mStateMachines) {

            return mActiveDevice;

        }
@@ -1049,7 +1049,7 @@ public class HeadsetService extends ProfileService { 
    }



    boolean startScoUsingVirtualVoiceCall(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        synchronized (mStateMachines) {

            final HeadsetStateMachine stateMachine = mStateMachines.get(device);

            if (stateMachine == null) {
@@ -1063,7 +1063,7 @@ public class HeadsetService extends ProfileService { 
    }



    boolean stopScoUsingVirtualVoiceCall(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        synchronized (mStateMachines) {

            final HeadsetStateMachine stateMachine = mStateMachines.get(device);

            if (stateMachine == null) {