Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash caused by toHex returning exception"

Browse Source
This commit is contained in:
Paul Lawrence
2015-01-06 23:34:06 +00:00
committed by Gerrit Code Review
parent da90a9c235 24063b5ebd
commit a15d6402cf
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/MountService.java
View File

@@ -2371,9 +2371,16 @@ class MountService extends IMountService.Stub
final NativeDaemonEvent event; final NativeDaemonEvent event;
try { try {
event = mConnector.execute("cryptfs", "getpw"); event = mConnector.execute("cryptfs", "getpw");
if ("-1".equals(event.getMessage())) {
// -1 equals no password
return null;
}
return fromHex(event.getMessage()); return fromHex(event.getMessage());
} catch (NativeDaemonConnectorException e) { } catch (NativeDaemonConnectorException e) {
throw e.rethrowAsParcelableException(); throw e.rethrowAsParcelableException();
} catch (IllegalArgumentException e) {
Slog.e(TAG, "Invalid response to getPassword");
return null;
} }
} }