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

2018-03-27 02:49:30 +00:00
parent df101a4596 63a69fd4f8
commit 02a005703a
1 changed files with 2 additions and 2 deletions
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -243,11 +243,11 @@ public class MtpDatabase implements AutoCloseable {
        }
    };

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