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

am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."

Browse Source 
* commit '5106dd44f9e5877aee8e70711c026e9e23783d4c':
  Throw IllegalArgumentException on invalid hex-strings.
This commit is contained in:
Narayan Kamath
2014-12-29 16:15:04 +00:00
committed by Android Git Automerger
parent be8053a23c 5106dd44f9
commit c97d1fbbe0
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2155,7 +2155,7 @@ class MountService extends IMountService.Stub
}
}
private String toHex(String password) {
private static String toHex(String password) {
if (password == null) {
return "";
}
@@ -2163,18 +2163,12 @@ class MountService extends IMountService.Stub
return new String(HexEncoding.encode(bytes));
}
private String fromHex(String hexPassword) {
private static String fromHex(String hexPassword) throws IllegalArgumentException {
if (hexPassword == null) {
return null;
}
final byte[] bytes;
try {
bytes = HexEncoding.decode(hexPassword.toCharArray(), false);
} catch (IllegalArgumentException e) {
return null;
}
final byte[] bytes = HexEncoding.decode(hexPassword.toCharArray(), false);
return new String(bytes, StandardCharsets.UTF_8);
}