Merge "Pass the media capabilities uid when opening media" into sc-dev

import android.database.MatrixCursor.RowBuilder;

import android.graphics.Point;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.FileObserver;

        final int pfdMode = ParcelFileDescriptor.parseMode(mode);

        if (pfdMode == ParcelFileDescriptor.MODE_READ_ONLY || visibleFile == null) {

            return ParcelFileDescriptor.open(file, pfdMode);

            return openFileForRead(file);

        } else {

            try {

                // When finished writing, kick off media scanner

        }

    }

    private ParcelFileDescriptor openFileForRead(final File target) throws FileNotFoundException {

        final Uri uri = MediaStore.scanFile(getContext().getContentResolver(), target);

        // Passing the calling uid via EXTRA_MEDIA_CAPABILITIES_UID, so that the decision to

        // transcode or not transcode can be made based upon the calling app's uid, and not based

        // upon the Provider's uid.

        final Bundle opts = new Bundle();

        opts.putInt(MediaStore.EXTRA_MEDIA_CAPABILITIES_UID, Binder.getCallingUid());

        final AssetFileDescriptor afd =

                getContext().getContentResolver().openTypedAssetFileDescriptor(uri, "*/*", opts);

        if (afd == null) {

            return null;

        }

        return afd.getParcelFileDescriptor();

    }

    /**

     * Test if the file matches the query arguments.

     *