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

Commit 1ef98fb3 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am 5cb09b7d: am 8b283df9: am b6b4f171: Merge "Change getName and getAddress... 

am 5cb09b7d: am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev

* commit '5cb09b7d':
  Change getName and getAddress permission to BLUETOOTH
parents 3ff11390 5cb09b7d

services/java/com/android/server/BluetoothManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -513,8 +513,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        }

    }

    public String getAddress() {

        mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,

                                                "Need BLUETOOTH ADMIN permission");

        mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM,

                                                "Need BLUETOOTH permission");



        if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&

            (!checkIfCallerIsForegroundUser())) {
@@ -538,8 +538,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    }



    public String getName() {

        mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,

                                                "Need BLUETOOTH ADMIN permission");

        mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM,

                                                "Need BLUETOOTH permission");



        if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&

            (!checkIfCallerIsForegroundUser())) {