am da3bb70a: am 54973710: Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb

* commit 'da3bb70a1f9240766d60bffa039d26e6378f2a6c': Environment.isExternalStorageRemovable() is false if external storage is emulated
2011-01-19 10:44:32 -08:00
parent 4ef9ac9fc8 da3bb70a1f
commit ee8d313985
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -416,6 +416,7 @@ public class Environment {
     * <p>See {@link #getExternalStorageDirectory()} for more information.
     */
    public static boolean isExternalStorageRemovable() {
+        if (isExternalStorageEmulated()) return false;
        return Resources.getSystem().getBoolean(
                com.android.internal.R.bool.config_externalStorageRemovable);
    }