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

Merge "Fix notifications for USB PD enabled devices" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-20 18:32:09 +00:00
committed by Android (Google) Code Review
parent df9dee869c a0116bf81f
commit 73722c4b0c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,6 +319,7 @@ public class UsbDeviceManager {
// current USB state // current USB state
private boolean mConnected; private boolean mConnected;
private boolean mHostConnected; private boolean mHostConnected;
private boolean mSourcePower;
private boolean mConfigured; private boolean mConfigured;
private boolean mUsbDataUnlocked; private boolean mUsbDataUnlocked;
private String mCurrentFunctions; private String mCurrentFunctions;
@@ -399,7 +400,8 @@ public class UsbDeviceManager {
public void updateHostState(UsbPort port, UsbPortStatus status) { public void updateHostState(UsbPort port, UsbPortStatus status) {
boolean hostConnected = status.getCurrentDataRole() == UsbPort.DATA_ROLE_HOST; boolean hostConnected = status.getCurrentDataRole() == UsbPort.DATA_ROLE_HOST;
obtainMessage(MSG_UPDATE_HOST_STATE, hostConnected ? 1 :0, 0).sendToTarget(); boolean sourcePower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE;
obtainMessage(MSG_UPDATE_HOST_STATE, hostConnected ? 1 :0, sourcePower ? 1 :0).sendToTarget();
} }
private boolean waitForState(String state) { private boolean waitForState(String state) {
@@ -717,6 +719,7 @@ public class UsbDeviceManager {
break; break;
case MSG_UPDATE_HOST_STATE: case MSG_UPDATE_HOST_STATE:
mHostConnected = (msg.arg1 == 1); mHostConnected = (msg.arg1 == 1);
mSourcePower = (msg.arg2 == 1);
updateUsbNotification(); updateUsbNotification();
if (mBootCompleted) { if (mBootCompleted) {
updateUsbStateBroadcastIfNeeded(); updateUsbStateBroadcastIfNeeded();
@@ -782,7 +785,11 @@ public class UsbDeviceManager {
Resources r = mContext.getResources(); Resources r = mContext.getResources();
if (mConnected) { if (mConnected) {
if (!mUsbDataUnlocked) { if (!mUsbDataUnlocked) {
id = com.android.internal.R.string.usb_charging_notification_title; if (mSourcePower) {
id = com.android.internal.R.string.usb_supplying_notification_title;
} else {
id = com.android.internal.R.string.usb_charging_notification_title;
}
} else if (UsbManager.containsFunction(mCurrentFunctions, } else if (UsbManager.containsFunction(mCurrentFunctions,
UsbManager.USB_FUNCTION_MTP)) { UsbManager.USB_FUNCTION_MTP)) {
id = com.android.internal.R.string.usb_mtp_notification_title; id = com.android.internal.R.string.usb_mtp_notification_title;
@@ -795,10 +802,12 @@ public class UsbDeviceManager {
} else if (UsbManager.containsFunction(mCurrentFunctions, } else if (UsbManager.containsFunction(mCurrentFunctions,
UsbManager.USB_FUNCTION_ACCESSORY)) { UsbManager.USB_FUNCTION_ACCESSORY)) {
id = com.android.internal.R.string.usb_accessory_notification_title; id = com.android.internal.R.string.usb_accessory_notification_title;
} else if (mSourcePower) {
id = com.android.internal.R.string.usb_supplying_notification_title;
} else { } else {
id = com.android.internal.R.string.usb_charging_notification_title; id = com.android.internal.R.string.usb_charging_notification_title;
} }
} else if (mHostConnected) { } else if (mSourcePower) {
id = com.android.internal.R.string.usb_supplying_notification_title; id = com.android.internal.R.string.usb_supplying_notification_title;
} }
if (id != mUsbNotificationId) { if (id != mUsbNotificationId) {