diff options
author | Eric Biggers <ebiggers@google.com> | 2023-08-10 04:39:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-10 04:39:57 +0000 |
commit | 7d71f05f9900f86aacd4065fe3b880eb3d9d7bac (patch) | |
tree | b928705b81cc4c915a08aeba104b841e9b5269f3 | |
parent | 2216dfe369cdcbcab14682cdea09c141561a4472 (diff) | |
parent | 0f806a3506ec0247f5ef5aae4ab077d619efad54 (diff) | |
download | setupwizard-7d71f05f9900f86aacd4065fe3b880eb3d9d7bac.tar.gz |
InitialLockSetupHelper: fix chars <=> bytes conversion am: d890ee393b am: d4969d6e72 am: 899c141878 am: 0f806a3506ub-automotive-master-20240125
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2700613
Change-Id: I99e808d049332b3341d5ca5793abc7dee654a23f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | library/utils/src/com/android/car/setupwizardlib/InitialLockSetupHelper.java | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/library/utils/src/com/android/car/setupwizardlib/InitialLockSetupHelper.java b/library/utils/src/com/android/car/setupwizardlib/InitialLockSetupHelper.java index 191ddbc..f4c6385 100644 --- a/library/utils/src/com/android/car/setupwizardlib/InitialLockSetupHelper.java +++ b/library/utils/src/com/android/car/setupwizardlib/InitialLockSetupHelper.java @@ -18,6 +18,8 @@ package com.android.car.setupwizardlib; import com.android.car.setupwizardlib.InitialLockSetupConstants.ValidateLockFlags; +import java.nio.charset.StandardCharsets; + /** * Provides helper methods for the usage of the InitialLockSetupService. */ @@ -54,18 +56,13 @@ public class InitialLockSetupHelper { } /** - * Converts a {@link CharSequence} into an array of bytes. This is for security reasons to avoid - * storing strings in memory. + * Converts a {@link CharSequence} into an array of bytes. */ public static byte[] charSequenceToByteArray(CharSequence chars) { if (chars == null) { return null; } - byte[] byteArray = new byte[chars.length()]; - for (int i = 0; i < chars.length(); i++) { - byteArray[i] = (byte) chars.charAt(i); - } - return byteArray; + return chars.toString().getBytes(StandardCharsets.UTF_8); } /** @@ -75,11 +72,7 @@ public class InitialLockSetupHelper { if (input == null) { return null; } - StringBuffer charSequence = new StringBuffer(); - for (int i = 0; i < input.length; i++) { - charSequence.append((char) input[i]); - } - return charSequence; + return new String(input, StandardCharsets.UTF_8); } /** Return an ASCII-equivalent array of character digits for a numeric byte input. */ |