summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2012-01-03 10:57:19 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-03 10:57:19 -0800
commitb8f90a0e6eae582778bbe10b6347acbf5fc69bfb (patch)
treedf53d1eb393193d10a612e797a92238f6abf88f0
parent478e45be576a08567333e4846ee80de11acfdfb6 (diff)
parentda6aedf716bfdd40148823fb63d666d34b7b425e (diff)
Merge "Test the correct return code from call to cryptfs."
-rw-r--r--services/java/com/android/server/MountService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java
index 1dd6bca9e3b7..a32e9f5c8467 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -1792,7 +1792,7 @@ class MountService extends IMountService.Stub
try {
event = mConnector.execute("cryptfs", "checkpw", password);
- final int code = event.getCode();
+ final int code = Integer.parseInt(event.getMessage());
if (code == 0) {
// Decrypt was successful. Post a delayed message before restarting in order
// to let the UI to clear itself