summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matthew Xie <mattx@google.com> 2012-12-04 11:29:53 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-12-04 11:29:53 -0800
commit1ef98fb37e1b1cb0d2bf6ab448b4ff52f5f28e80 (patch)
tree93cf79276706fd044fdc2cb68653be29586fe66c
parent3ff1139032b0d63522b627ccf69fdd0832a6da47 (diff)
parent5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a (diff)
am 5cb09b7d: am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
* commit '5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a': Change getName and getAddress permission to BLUETOOTH
-rwxr-xr-xservices/java/com/android/server/BluetoothManagerService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/java/com/android/server/BluetoothManagerService.java
index 7f52157d54d8..5a2088ce01c7 100755
--- a/services/java/com/android/server/BluetoothManagerService.java
+++ b/services/java/com/android/server/BluetoothManagerService.java
@@ -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())) {