commit 5829b8752193bb3d6e830dd8d6927cb02b634687
author android-build-team Robot <android-build-team-robot@google.com> Tue Aug 08 17:52:59 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Aug 08 17:52:59 2017 +0000
tree 488cfc0d7937acc070fe192cca6b2b0f89d70148
parent c3f69bd768e437afd5d8d87b5fbf8adf49723c82
parent e912d3d00fe440be802e936af3f3a6eb62e898a2

Merge cherrypicks of [2686350, 2686440] into oc-r4-release

Change-Id: I2398535d2be0bd039cf9ea5417b15933515f405f

src/com/android/providers/media/MtpReceiver.java

diff --git a/src/com/android/providers/media/MtpReceiver.java b/src/com/android/providers/media/MtpReceiver.java
index 0895c5e..5f38018 100644
--- a/src/com/android/providers/media/MtpReceiver.java
+++ b/src/com/android/providers/media/MtpReceiver.java
@@ -36,6 +36,10 @@
     public void onReceive(Context context, Intent intent) {
         final String action = intent.getAction();
         if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
+            // If we somehow fail to configure after boot, it becomes difficult to
+            // recover usb state. Thus we always configure once on boot, but it
+            // has no effect if Mtp is disabled or already configured.
+            MtpServer.configure(false);
             final Intent usbState = context.registerReceiver(
                     null, new IntentFilter(UsbManager.ACTION_USB_STATE));
             if (usbState != null) {