Merge "resolve merge conflicts of 95330efa55 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp (1b82a4e5) · Commits · e / os / android_frameworks_base

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

+17 −10

Original line number	Diff line number	Diff line
		@@ -1671,16 +1671,23 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		}

		@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);
		String errorMsg = null;
		if (mBluetoothBinder == null) {
		writer.println("Bluetooth Service not connected");
		errorMsg = "Bluetooth Service not connected";
		} else {
		try {
		mBluetoothBinder.dump(fd, args);
		} 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);
		}
		}
		}