Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 774d89ef authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

Resolve media directories to the real paths 

as /product may be a symlink to /system/product.

Bug: 147688127
Bug: 147701212
Test: pass android.telecom.cts.BackgroundCallAudioTest on GSI

Change-Id: Ie3588edece1e19ad12bdbf5825b9ff7dfc31cecd
parent a7050d47

core/java/android/os/Environment.java

+14 −3
Original line number Diff line number Diff line
@@ -34,9 +34,11 @@ import android.text.TextUtils; 
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.
@@ -539,12 +541,21 @@ public class Environment { 
    @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