commit 98607d444903f5c74fe190f65800a5679b312c4e
author Daichi Hirono <hirono@google.com> Thu Mar 24 02:46:23 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 24 02:46:23 2016 +0000
tree 5a0b45e97909ee8919b6c094cb2a8a95f04aae55
parent d0f8d9257b0b1076bbc5fa567fe98c2ae460a291
parent 0f6796284b869f7f2863b22f686191539f2c5e02

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

src/com/android/settings/deviceinfo/UsbModeChooserActivity.java

diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index bb8ffc1..d592fcc 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -68,7 +68,9 @@
             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();
                 }
             }