Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev

2016-03-24 02:46:23 +00:00
parent d0f8d9257b 0f6796284b
commit 98607d4449
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -68,7 +68,9 @@ public class UsbModeChooserActivity extends Activity {
            String action = intent.getAction();
            if (UsbManager.ACTION_USB_STATE.equals(action)) {
                boolean connected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
-                if (!connected) {
+                boolean hostConnected =
+                        intent.getBooleanExtra(UsbManager.USB_HOST_CONNECTED, false);
+                if (!connected && !hostConnected) {
                    mDialog.dismiss();
                }
            }