Reformat code (c4616503) · Commits · e / os / android_frameworks_base

services/usb/java/com/android/server/usb/UsbPortManager.java

+57 −51

Original line number	Diff line number	Diff line
		@@ -273,7 +273,8 @@ public class UsbPortManager {
		} catch (RemoteException e) {
		logAndPrintException(pw, "Failed to set the USB port power role: "
		+ "portId=" + portId
		+ ", newPowerRole=" + UsbPort.powerRoleToString(newRole.role),
		+ ", newPowerRole=" + UsbPort.powerRoleToString
		(newRole.role),
		e);
		return;
		}
		@@ -287,7 +288,8 @@ public class UsbPortManager {
		} catch (RemoteException e) {
		logAndPrintException(pw, "Failed to set the USB port data role: "
		+ "portId=" + portId
		+ ", newDataRole=" + UsbPort.dataRoleToString(newRole.role),
		+ ", newDataRole=" + UsbPort.dataRoleToString(newRole
		.role),
		e);
		return;
		}
		@@ -425,7 +427,9 @@ public class UsbPortManager {
		}

		public void notifyPortStatusChange(ArrayList<PortStatus> currentPortStatus, int retval) {
		if (!portManager.mSystemReady) return;
		if (!portManager.mSystemReady) {
		return;
		}

		if (retval != Status.SUCCESS) {
		logAndPrint(Log.ERROR, pw, "port status enquiry failed");
		@@ -490,7 +494,9 @@ public class UsbPortManager {

		private void connectToProxy(IndentingPrintWriter pw) {
		synchronized (mLock) {
		if (mProxy != null) return;
		if (mProxy != null) {
		return;
		}

		try {
		mProxy = IUsb.getService(sServiceName);