Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Suppress output for Protobuf data if Bluetooth is disabled"

Browse Source 
am: b82b7527f1

* commit 'b82b7527f1f65035fbe072a4efff472efec8e046':
  Suppress output for Protobuf data if Bluetooth is disabled
This commit is contained in:
Pavlin Radoslavov
2016-02-23 23:53:17 +00:00
committed by android-build-merger
parent f96275dca0 b82b7527f1
commit 95330efa55
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -1831,14 +1831,21 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
@Override @Override
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
String errorMsg = null;
if (mBluetoothBinder == null) { if (mBluetoothBinder == null) {
writer.println("Bluetooth Service not connected"); errorMsg = "Bluetooth Service not connected";
} else { } else {
try { try {
mBluetoothBinder.dump(fd, args); mBluetoothBinder.dump(fd, args);
} catch (RemoteException re) { } catch (RemoteException re) {
writer.println("RemoteException while calling Bluetooth Service"); errorMsg = "RemoteException while calling Bluetooth Service";
} }
} }
if (errorMsg != null) {
// Silently return if we are extracting metrics in Protobuf format
if ((args.length > 0) && args[0].startsWith("--proto"))
return;
writer.println(errorMsg);
}
} }
} }