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

Merge "resolve merge conflicts of 95330efa55 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp

Browse Source
This commit is contained in:
Pavlin Radoslavov
2016-02-24 01:09:17 +00:00
committed by Android (Google) Code Review
parent 0bf96d30e7 3dff8e5a76
commit 1b82a4e575
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1671,16 +1671,23 @@ 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);
if (mBluetoothBinder == null) { String errorMsg = null;
writer.println("Bluetooth Service not connected"); if (mBluetoothBinder == null) {
} else { errorMsg = "Bluetooth Service not connected";
try { } else {
mBluetoothBinder.dump(fd, args); try {
} catch (RemoteException re) { mBluetoothBinder.dump(fd, args);
writer.println("RemoteException while calling Bluetooth Service"); } catch (RemoteException re) {
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);
} }
}
} }
} }