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

Commit b6b4f171 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev

parents d8cb8fa4 af5ddbfc

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())) {