From 63a69fd4f8d21c19fefc88437cc27a96775a87ca Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Fri, 2 Feb 2018 17:20:41 -0800 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java index 32a00d597e624..1244d7f040b42 100755 --- 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);