commit d53f8a86d3a483d96b9d87fd89b09942d40e0a41
author Ken Sumrall <ksumrall@android.com> Sun Jul 17 12:21:00 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jul 17 12:21:00 2011 -0700
tree 72f856ddee07fbd4ffb9e574ae03704fa6913f2e
parent 6fa7e7e9bb244735b98fbf35599dc07729e47a8f
parent 18db5c5690472f9da6ce2d580067307378675809

Merge "During encryption, don't throw exceptions for unknown vold state"

services/java/com/android/server/MountService.java

diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java
index 94465fd..7f61c635 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -1339,7 +1339,11 @@
             String state = mVolumeStates.get(mountPoint);
             if (state == null) {
                 Slog.w(TAG, "getVolumeState(" + mountPoint + "): Unknown volume");
-                throw new IllegalArgumentException();
+                if (SystemProperties.get("vold.encrypt_progress").length() != 0) {
+                    state = Environment.MEDIA_REMOVED;
+                } else {
+                    throw new IllegalArgumentException();
+                }
             }
 
             return state;