Merge "Resolve media directories to the real paths"

import android.util.Log;

import java.io.File;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Collection;

import java.util.LinkedList;

import java.util.List;

/**

 * Provides access to environment variables.

    @SystemApi

    public static @NonNull Collection<File> getInternalMediaDirectories() {

        final ArrayList<File> res = new ArrayList<>();

        res.add(new File(Environment.getRootDirectory(), "media"));

        res.add(new File(Environment.getOemDirectory(), "media"));

        res.add(new File(Environment.getProductDirectory(), "media"));

        addCanonicalFile(res, new File(Environment.getRootDirectory(), "media"));

        addCanonicalFile(res, new File(Environment.getOemDirectory(), "media"));

        addCanonicalFile(res, new File(Environment.getProductDirectory(), "media"));

        return res;

    }

    private static void addCanonicalFile(List<File> list, File file) {

        try {

            list.add(file.getCanonicalFile());

        } catch (IOException e) {

            Log.w(TAG, "Failed to resolve " + file + ": " + e);

            list.add(file);

        }

    }

    /**

     * Return the primary shared/external storage directory. This directory may

     * not currently be accessible if it has been mounted by the user on their