From ecf906ed67674e651cec7cd62d2262e27310d0e7 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Thu, 20 Apr 2017 13:46:29 -0700 Subject: Don't skip intents where config changed. Since we are adding ffs.mtp.ready to the init scripts, we can no longer skip intents that cause that property to be set. This fixes the case where device is disconnected and adb is repeatedly enabled/disabled. Test: enable/disable adb, usb mtp Bug: 33220530 Change-Id: I48e687c1af3f9da9e522ebe879285877c0168da8 --- services/usb/java/com/android/server/usb/UsbDeviceManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index b9d22e84a88b..24cd3c78ead7 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -682,7 +682,7 @@ public class UsbDeviceManager { } // send broadcast intent only if the USB state has changed - if (!isUsbStateChanged(intent)) { + if (!isUsbStateChanged(intent) && !configChanged) { if (DEBUG) { Slog.d(TAG, "skip broadcasting " + intent + " extras: " + intent.getExtras()); } -- cgit v1.2.3-59-g8ed1b