diff options
author | Jerry Zhang <zhangjerry@google.com> | 2017-08-07 20:56:18 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-07 20:56:18 +0000 |
commit | 460220fe48b1a44bdd9f1ca58601f3e1dcaf05f4 (patch) | |
tree | fa325354589f0dbd78579817d412012ed8562ce9 | |
parent | 41a4f5aa925ad7cd7df0d12f38319fafe674610f (diff) | |
parent | abeeb859e83e860345dc0b926b4cb940deeacb53 (diff) | |
download | MediaProvider-460220fe48b1a44bdd9f1ca58601f3e1dcaf05f4.tar.gz |
Configure Mtp once on boot. am: a21c1f467f
am: abeeb859e8
Change-Id: If2197dea9b3fbce5ad11eac7cc48f0b0e89b20ae
-rw-r--r-- | src/com/android/providers/media/MtpReceiver.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/providers/media/MtpReceiver.java b/src/com/android/providers/media/MtpReceiver.java index 0895c5e5e..5f3801814 100644 --- a/src/com/android/providers/media/MtpReceiver.java +++ b/src/com/android/providers/media/MtpReceiver.java @@ -36,6 +36,10 @@ public class MtpReceiver extends BroadcastReceiver { 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) { |