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

        }

    };

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