drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '8b283df989f9b8b71797f9feaeb15cb012ab3190':
  Change getName and getAddress permission to BLUETOOTH
This commit is contained in:
Matthew Xie
2012-12-04 11:27:11 -08:00
committed by Android Git Automerger
parent 994901ee7f 8b283df989
commit 5cb09b7dc5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/BluetoothManagerService.java
View File

@ -513,8 +513,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} }
} }
public String getAddress() { public String getAddress() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM,
"Need BLUETOOTH ADMIN permission"); "Need BLUETOOTH permission");
if ((Binder.getCallingUid() != Process.SYSTEM_UID) && if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
(!checkIfCallerIsForegroundUser())) { (!checkIfCallerIsForegroundUser())) {
@ -538,8 +538,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} }
public String getName() { public String getName() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM,
"Need BLUETOOTH ADMIN permission"); "Need BLUETOOTH permission");
if ((Binder.getCallingUid() != Process.SYSTEM_UID) && if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
(!checkIfCallerIsForegroundUser())) { (!checkIfCallerIsForegroundUser())) {