summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-10-15 00:25:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-15 00:25:23 +0000
commitddf5a170d592614cbc2b7c1d88d906b7683e51d1 (patch)
tree06423e953726c0d850e7ff5b0713a3b4f93be970 /core/java/android
parent8e656df0929b352660fd6d6209eabc4267c1941f (diff)
parenta6d19995292a82e6d480779acfbd8e140bebecb9 (diff)
downloadframeworks_base-ddf5a170d592614cbc2b7c1d88d906b7683e51d1.zip
frameworks_base-ddf5a170d592614cbc2b7c1d88d906b7683e51d1.tar.gz
frameworks_base-ddf5a170d592614cbc2b7c1d88d906b7683e51d1.tar.bz2
Merge "Relax user constraint on storage state." into klp-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/Environment.java3
1 files changed, 2 insertions, 1 deletions
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 @@ 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);
}
/**