am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev

* commit 'ddf5a170d592614cbc2b7c1d88d906b7683e51d1': Relax user constraint on storage state.
2013-10-14 17:29:34 -07:00
parent ac0cb3591a ddf5a170d5
commit 16c4b8c599
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -686,7 +686,8 @@ public class Environment {
     *         {@link #MEDIA_BAD_REMOVAL}, or {@link #MEDIA_UNMOUNTABLE}.
     */
    public static String getExternalStorageState() {
-        return getStorageState(getExternalStorageDirectory());
+        final File externalDir = sCurrentUser.getExternalDirsForApp()[0];
+        return getStorageState(externalDir);
    }

    /**