diff options
| -rw-r--r-- | services/core/java/com/android/server/MountService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 59570bf7eada..79cd867416ff 100644 --- 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; } } |