From 0f6796284b869f7f2863b22f686191539f2c5e02 Mon Sep 17 00:00:00 2001 From: Daichi Hirono Date: Tue, 22 Mar 2016 11:04:29 +0900 Subject: [PATCH] Don't close USB type notification when USB is connected to USB devices. Previously we show a notificatino to show the UsbModeChooser when Android is connected to another Android via USB type C cable. However UsbModeChoooser activity was closed immediately after a user tapped the notification, if the Android worked as host. FIXED=27535640 Change-Id: I707dcbf1021e7381096c0ae7cc2d712892ac5a5a --- .../android/settings/deviceinfo/UsbModeChooserActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java index bb8ffc17d60..d592fcc5058 100644 --- 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(); } }