am a15d6402: Merge "Fix crash caused by toHex returning exception"

* commit 'a15d6402cf4f99e448c7aaa69553483cdb18e0d4': Fix crash caused by toHex returning exception
2015-01-06 23:39:44 +00:00
parent d8aa4660b0 a15d6402cf
commit 53d1022e83
1 changed files with 7 additions and 0 deletions
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -2371,9 +2371,16 @@ class MountService extends IMountService.Stub
        final NativeDaemonEvent event;
        try {
            event = mConnector.execute("cryptfs", "getpw");
+            if ("-1".equals(event.getMessage())) {
+                // -1 equals no password
+                return null;
+            }
            return fromHex(event.getMessage());
        } catch (NativeDaemonConnectorException e) {
            throw e.rethrowAsParcelableException();
+        } catch (IllegalArgumentException e) {
+            Slog.e(TAG, "Invalid response to getPassword");
+            return null;
        }
    }