commit 02a005703a95d83537c05c34595861a53a72c5bf
author Jerry Zhang <zhangjerry@google.com> Tue Mar 27 02:49:30 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 02:49:30 2018 +0000
tree 901f7579a73fc43df558347bd6bf6304dac923b7
parent df101a459692cda5c73d149c582d68dc42ece852
parent 63a69fd4f8d21c19fefc88437cc27a96775a87ca

Merge "Revert "Add additional context to MtpDatabase"" into pi-dev

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);