commit 057d21e2078eeccf22412e61c9c81ab8f448e0c0
author Mike Lockwood <lockwood@google.com> Thu Dec 18 22:45:59 2014 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 18 22:45:59 2014 +0000
tree b30cc7fdba6d98275bd798b9afe07a9f18e4f38d
parent c21e364386ee0a900d166ae90f09fa1899cd31f2
parent 6f2ea24086be9eb9650aa647c25843d9371c77f7

am 4ad35f9c: am 8a0399c4: Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev
automerge: 6f2ea24

* commit '6f2ea24086be9eb9650aa647c25843d9371c77f7':
  BluetoothManagerService: Enforce DUMP permission

services/core/java/com/android/server/BluetoothManagerService.java

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 @@
 
     @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);