commit a15d6402cf4f99e448c7aaa69553483cdb18e0d4
author Paul Lawrence <paullawrence@google.com> Tue Jan 06 23:34:06 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 06 23:34:07 2015 +0000
tree 10731de848ac6061d2e7140356094ad88b924fd7
parent da90a9c2355841bb98c2a669446b93ffe487a829
parent 24063b5ebd9124e27ea1dbd06ba6a3dd31944643

Merge "Fix crash caused by toHex returning exception"

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

diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 59570bf..79cd867 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -2371,9 +2371,16 @@
         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;
         }
     }