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

Handle USB power role 'sink'

Browse Source 
Fixes: 29963134
Change-Id: I7cfe042ed007d36cee5f8bc4c0fa33f8936cba3d
This commit is contained in:
Philip P. Moltmann
2016-07-15 13:21:23 -07:00
parent b1008221f9
commit 0135516153
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -49,6 +49,7 @@ import android.util.Pair;
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.os.SomeArgs;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.FgThread;
@@ -320,6 +321,7 @@ public class UsbDeviceManager {
private boolean mConnected;
private boolean mHostConnected;
private boolean mSourcePower;
private boolean mSinkPower;
private boolean mConfigured;
private boolean mUsbDataUnlocked;
private String mCurrentFunctions;
@@ -401,7 +403,19 @@ public class UsbDeviceManager {
public void updateHostState(UsbPort port, UsbPortStatus status) {
boolean hostConnected = status.getCurrentDataRole() == UsbPort.DATA_ROLE_HOST;
boolean sourcePower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE;
obtainMessage(MSG_UPDATE_HOST_STATE, hostConnected ? 1 :0, sourcePower ? 1 :0).sendToTarget();
boolean sinkPower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SINK;
if (DEBUG) {
Slog.i(TAG, "updateHostState " + port + ": dataRole=" + status.getCurrentDataRole() +
", powerRole=" + status.getCurrentPowerRole());
}
SomeArgs args = SomeArgs.obtain();
args.argi1 = hostConnected ? 1 :0;
args.argi2 = sourcePower ? 1 :0;
args.argi3 = sinkPower ? 1 :0;
obtainMessage(MSG_UPDATE_HOST_STATE, args).sendToTarget();
}
private boolean waitForState(String state) {
@@ -718,8 +732,11 @@ public class UsbDeviceManager {
}
break;
case MSG_UPDATE_HOST_STATE:
mHostConnected = (msg.arg1 == 1);
mSourcePower = (msg.arg2 == 1);
SomeArgs args = (SomeArgs) msg.obj;
mHostConnected = (args.argi1 == 1);
mSourcePower = (args.argi2 == 1);
mSinkPower = (args.argi3 == 1);
args.recycle();
updateUsbNotification();
if (mBootCompleted) {
updateUsbStateBroadcastIfNeeded();
@@ -809,6 +826,8 @@ public class UsbDeviceManager {
}
} else if (mSourcePower) {
id = com.android.internal.R.string.usb_supplying_notification_title;
} else if (mSinkPower) {
id = com.android.internal.R.string.usb_charging_notification_title;
}
if (id != mUsbNotificationId) {
// clear notification if title needs changing