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

            String state = mVolumeStates.get(mountPoint);

            if (state == null) {

                Slog.w(TAG, "getVolumeState(" + mountPoint + "): Unknown volume");

                if (SystemProperties.get("vold.encrypt_progress").length() != 0) {

                    state = Environment.MEDIA_REMOVED;

                } else {

                    throw new IllegalArgumentException();

                }

            }

            return state;

        }