commit b8f90a0e6eae582778bbe10b6347acbf5fc69bfb
author Jeff Sharkey <jsharkey@android.com> Tue Jan 03 10:57:19 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 03 10:57:19 2012 -0800
tree df53d1eb393193d10a612e797a92238f6abf88f0
parent 478e45be576a08567333e4846ee80de11acfdfb6
parent da6aedf716bfdd40148823fb63d666d34b7b425e

Merge "Test the correct return code from call to cryptfs."

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

diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java
index 1dd6bca..a32e9f5 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -1792,7 +1792,7 @@
         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