commit 63a69fd4f8d21c19fefc88437cc27a96775a87ca
author Jerry Zhang <zhangjerry@google.com> Fri Feb 02 17:20:41 2018 -0800
committer Jerry Zhang <zhangjerry@google.com> Thu Mar 22 11:35:19 2018 -0700
tree 064c3acc7cfe9a018cc53bccb00dfb6c3052c716
parent 6d319b8aaa961862afac48010d96d03afb11fa1c

Revert "Add additional context to MtpDatabase"

This reverts commit 5f0139d2e8bc8b5819e2c5ef4440f766a4af8813.

Bug: 72877143
Test: Switch users, use MTP
Change-Id: Ide372a9311a4f2647715d052fc0e1d9a04808aa0

media/java/android/mtp/MtpDatabase.java

diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java
index 32a00d5..1244d7f 100755
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -243,11 +243,11 @@
         }
     };
 
-    public MtpDatabase(Context context, Context userContext, String volumeName,
+    public MtpDatabase(Context context, String volumeName,
             String[] subDirectories) {
         native_setup();
         mContext = context;
-        mMediaProvider = userContext.getContentResolver()
+        mMediaProvider = context.getContentResolver()
                 .acquireContentProviderClient(MediaStore.AUTHORITY);
         mVolumeName = volumeName;
         mObjectsUri = Files.getMtpObjectsUri(volumeName);