am 8a0399c4: Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev

* commit '8a0399c442522bf2dab20c688a99d92faa01f9b1':
  BluetoothManagerService: Enforce DUMP permission

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 ca376fdfe9ef..32a6a2faad75 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);