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

* commit 'b6b4f171ff38ccac833edb2a1ad7f725ed068d46':
  Change getName and getAddress permission to BLUETOOTH
This commit is contained in:
Matthew Xie
2012-12-04 11:25:14 -08:00
committed by Android Git Automerger

View File

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