am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." (df444856) · Commits · e / os / android_frameworks_base

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

+3 −9

Original line number	Diff line number	Diff line
		@@ -2203,7 +2203,7 @@ class MountService extends IMountService.Stub
		}
		}

		private String toHex(String password) {
		private static String toHex(String password) {
		if (password == null) {
		return "";
		}
		@@ -2211,18 +2211,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);
		}