commit a6d19995292a82e6d480779acfbd8e140bebecb9
author Jeff Sharkey <jsharkey@android.com> Mon Oct 14 16:43:42 2013 -0700
committer Jeff Sharkey <jsharkey@android.com> Mon Oct 14 16:43:42 2013 -0700
tree 62788f49a3d6a3431f4a6a47970d608995c89bb3
parent c1c8f3f97d344a24bfddcb56a8be05e7e2fabe9e

Relax user constraint on storage state.

Otherwise we wtf() when called various places in the system.

Bug: 11223886
Change-Id: I514d28603db02e3debd4af1cf20049af0c7399f4

core/java/android/os/Environment.java

diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index db5cf1c..b5413db 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -686,7 +686,8 @@
      *         {@link #MEDIA_BAD_REMOVAL}, or {@link #MEDIA_UNMOUNTABLE}.
      */
     public static String getExternalStorageState() {
-        return getStorageState(getExternalStorageDirectory());
+        final File externalDir = sCurrentUser.getExternalDirsForApp()[0];
+        return getStorageState(externalDir);
     }
 
     /**