Merge "Reformat code" (76316580) · Commits · e / os / android_frameworks_base

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

+57 −51

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

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

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

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

	try {		try {
	mProxy = IUsb.getService(sServiceName);		mProxy = IUsb.getService(sServiceName);