diff options
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/MountService.java | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 285f1c1..c82c9ec 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -1307,6 +1307,7 @@ final class FragmentManagerImpl extends FragmentManager { mExecutingActions = true; for (int i=0; i<numActions; i++) { mTmpActions[i].run(); + mTmpActions[i] = null; } mExecutingActions = false; didSomething = true; 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 @@ class MountService extends IMountService.Stub implements INativeDaemonConnectorC 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; |