Merge "Revert "Add additional context to MtpDatabase"" into pi-dev
This commit is contained in:
@@ -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) {
|
String[] subDirectories) {
|
||||||
native_setup();
|
native_setup();
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mMediaProvider = userContext.getContentResolver()
|
mMediaProvider = context.getContentResolver()
|
||||||
.acquireContentProviderClient(MediaStore.AUTHORITY);
|
.acquireContentProviderClient(MediaStore.AUTHORITY);
|
||||||
mVolumeName = volumeName;
|
mVolumeName = volumeName;
|
||||||
mObjectsUri = Files.getMtpObjectsUri(volumeName);
|
mObjectsUri = Files.getMtpObjectsUri(volumeName);
|
||||||
|
|||||||
Reference in New Issue
Block a user