summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/MountService.java
diff options
context:
space:
mode:
authorFredrik Roubert <roubert@google.com>2011-12-20 17:34:43 +0100
committerFredrik Roubert <roubert@google.com>2011-12-20 18:47:33 +0100
commitda6aedf716bfdd40148823fb63d666d34b7b425e (patch)
tree24c3e406d196dfce461b62c8a78480d39b090b3d /services/java/com/android/server/MountService.java
parent9cfff10bf5266f5bda99d2e3cbbc19c046924dc8 (diff)
downloadframeworks_base-da6aedf716bfdd40148823fb63d666d34b7b425e.zip
frameworks_base-da6aedf716bfdd40148823fb63d666d34b7b425e.tar.gz
frameworks_base-da6aedf716bfdd40148823fb63d666d34b7b425e.tar.bz2
Test the correct return code from call to cryptfs.
This was broken in commit dd519fac9b79f36a27909149a90fce4321ed1c20 (certainly by mistake), in which Integer.parseInt(tokens[1]) was errornously replaced with event.getCode(). Change-Id: Ic5af5a2ec5f321da21a4a5db25f6908462f6cae8
Diffstat (limited to 'services/java/com/android/server/MountService.java')
-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 1dd6bca..a32e9f5 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