commit 424252f3cc7f584ef0122e474fa359892a0222f0
author Jerry Zhang <zhangjerry@google.com> Tue Dec 13 00:37:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 13 00:37:15 2016 +0000
tree f0d358b81b0f6dbfb6f442958d664bd731bd76ec
parent eef3b1c23e7753bd843fcb79d9f02010ca51d4f8
parent e7e9fabc7cb4d4dd1046e406ad03ec4a3bf50575

Merge "Run the configure method when mtp or ptp is enabled." am: 7477c6a13a
am: e7e9fabc7c

Change-Id: I6edeb9069e0d806b186ce7520e5869c1965cbd89

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 1f97f56..0e89902 100644
--- a/src/com/android/providers/media/MtpReceiver.java
+++ b/src/com/android/providers/media/MtpReceiver.java
@@ -16,6 +16,7 @@
 
 package com.android.providers.media;
 
+import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -23,7 +24,9 @@
 import android.hardware.usb.UsbManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.util.Log;
+import android.mtp.MtpServer;
 
 public class MtpReceiver extends BroadcastReceiver {
     private static final String TAG = MtpReceiver.class.getSimpleName();
@@ -45,12 +48,21 @@
 
     private void handleUsbState(Context context, Intent intent) {
         Bundle extras = intent.getExtras();
-        boolean connected = extras.getBoolean(UsbManager.USB_CONFIGURED);
+        boolean configured = extras.getBoolean(UsbManager.USB_CONFIGURED);
         boolean mtpEnabled = extras.getBoolean(UsbManager.USB_FUNCTION_MTP);
         boolean ptpEnabled = extras.getBoolean(UsbManager.USB_FUNCTION_PTP);
         boolean unlocked = extras.getBoolean(UsbManager.USB_DATA_UNLOCKED);
-        // Start MTP service if USB is connected and either the MTP or PTP function is enabled
-        if (connected && (mtpEnabled || ptpEnabled)) {
+        boolean configChanged = extras.getBoolean(UsbManager.USB_CONFIG_CHANGED);
+        boolean isCurrentUser = UserHandle.myUserId() == ActivityManager.getCurrentUser();
+
+        if (configChanged && (mtpEnabled || ptpEnabled)) {
+            if (!isCurrentUser)
+                return;
+            MtpServer.configure(ptpEnabled);
+            // tell MediaProvider MTP is configured so it can bind to the service
+            context.getContentResolver().insert(Uri.parse(
+                    "content://media/none/mtp_connected"), null);
+        } else if (configured && (mtpEnabled || ptpEnabled)) {
             intent = new Intent(context, MtpService.class);
             intent.putExtra(UsbManager.USB_DATA_UNLOCKED, unlocked);
             if (ptpEnabled) {
@@ -58,9 +70,6 @@
             }
             if (DEBUG) { Log.d(TAG, "handleUsbState startService"); }
             context.startService(intent);
-            // tell MediaProvider MTP is connected so it can bind to the service
-            context.getContentResolver().insert(Uri.parse(
-                    "content://media/none/mtp_connected"), null);
         } else {
             boolean status = context.stopService(new Intent(context, MtpService.class));
             if (DEBUG) { Log.d(TAG, "handleUsbState stopService status=" + status); }