diff options
| author | Matthew Xie <mattx@google.com> | 2012-12-04 11:21:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-04 11:21:55 -0800 |
| commit | b6b4f171ff38ccac833edb2a1ad7f725ed068d46 (patch) | |
| tree | 0b77a576ad282ff2150d6ca284cd4a13cffcbe33 /services | |
| parent | d8cb8fa463c9a527aff462f887dbca9fa9843fcf (diff) | |
| parent | af5ddbfcf59e1e0bcbd43f1f88270f822c5083b8 (diff) | |
| download | frameworks_base-b6b4f171ff38ccac833edb2a1ad7f725ed068d46.zip frameworks_base-b6b4f171ff38ccac833edb2a1ad7f725ed068d46.tar.gz frameworks_base-b6b4f171ff38ccac833edb2a1ad7f725ed068d46.tar.bz2 | |
Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
Diffstat (limited to 'services')
| -rwxr-xr-x | services/java/com/android/server/BluetoothManagerService.java | 8 |
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 7f52157..5a2088c 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())) { |