summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-12-18 22:33:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-18 22:34:00 +0000
commit8a0399c442522bf2dab20c688a99d92faa01f9b1 (patch)
tree09f84c13f7abae26048e8609230e47f1ce8d8847 /services
parentf87606fe25acff86807ef0514b478359bcb52f84 (diff)
parent75b52bb880e7b5380a27583ef65c4ea5222f9f44 (diff)
downloadframeworks_base-8a0399c442522bf2dab20c688a99d92faa01f9b1.zip
frameworks_base-8a0399c442522bf2dab20c688a99d92faa01f9b1.tar.gz
frameworks_base-8a0399c442522bf2dab20c688a99d92faa01f9b1.tar.bz2
Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/BluetoothManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index ca376fd..32a6a2f 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -1521,6 +1521,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
@Override
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+ mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
+
writer.println("enabled: " + mEnable);
writer.println("state: " + mState);
writer.println("address: " + mAddress);