Revert "DO NOT MERGE Refactor passwords/pins/patterns to byte[]"
This reverts commit 992f89107936e686b2cdd8235c931c3e9160460e.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I0246d33162b580022141dfb9ee7aeedb4405edd6
(cherry picked from commit 104a75b1acebd40df2db467258d1a3c87a0df302)
diff --git a/src/com/android/car/settings/security/ChooseLockTypeFragment.java b/src/com/android/car/settings/security/ChooseLockTypeFragment.java
index 2221060..91793fa 100644
--- a/src/com/android/car/settings/security/ChooseLockTypeFragment.java
+++ b/src/com/android/car/settings/security/ChooseLockTypeFragment.java
@@ -47,8 +47,7 @@
private final ConfirmRemoveScreenLockDialog.ConfirmRemoveLockListener mConfirmListener = () -> {
int userId = UserHandle.myUserId();
- byte[] passwordBytes = mCurrPassword != null ? mCurrPassword.getBytes() : null;
- new LockPatternUtils(getContext()).clearLock(passwordBytes, userId);
+ new LockPatternUtils(getContext()).clearLock(mCurrPassword, userId);
getFragmentController().goBack();
};
diff --git a/src/com/android/car/settings/security/PasswordHelper.java b/src/com/android/car/settings/security/PasswordHelper.java
index 1e7a41c..1182bcc 100644
--- a/src/com/android/car/settings/security/PasswordHelper.java
+++ b/src/com/android/car/settings/security/PasswordHelper.java
@@ -101,8 +101,8 @@
private int validatePin(String pin) {
int errorCode = NO_ERROR;
- byte[] pinBytes = pin != null ? pin.getBytes() : null;
- PasswordMetrics metrics = PasswordMetrics.computeForPassword(pinBytes);
+
+ PasswordMetrics metrics = PasswordMetrics.computeForPassword(pin);
int passwordQuality = getPasswordQuality();
if (metrics.length < MIN_LENGTH) {
@@ -115,7 +115,7 @@
if (passwordQuality == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX) {
// Check for repeated characters or sequences (e.g. '1234', '0000', '2468')
- int sequence = PasswordMetrics.maxLengthSequence(pinBytes);
+ int sequence = PasswordMetrics.maxLengthSequence(pin);
if (sequence > PasswordMetrics.MAX_ALLOWED_SEQUENCE) {
errorCode |= CONTAINS_SEQUENTIAL_DIGITS;
}
diff --git a/src/com/android/car/settings/security/SavePatternWorker.java b/src/com/android/car/settings/security/SavePatternWorker.java
index fe0fbf8..6904702 100644
--- a/src/com/android/car/settings/security/SavePatternWorker.java
+++ b/src/com/android/car/settings/security/SavePatternWorker.java
@@ -41,8 +41,7 @@
// If called after saveLockPattern, this will always be true
boolean isPatternEverChosen = getUtils().isPatternEverChosen(userId);
- byte[] currentPatternBytes = mCurrentPattern != null ? mCurrentPattern.getBytes() : null;
- getUtils().saveLockPattern(mChosenPattern, currentPatternBytes, userId);
+ getUtils().saveLockPattern(mChosenPattern, mCurrentPattern, userId);
if (!isPatternEverChosen) {
getUtils().setVisiblePatternEnabled(true, userId);
diff --git a/src/com/android/car/settings/security/SetupWizardScreenLockActivity.java b/src/com/android/car/settings/security/SetupWizardScreenLockActivity.java
index 4a11eaf..b67f718 100644
--- a/src/com/android/car/settings/security/SetupWizardScreenLockActivity.java
+++ b/src/com/android/car/settings/security/SetupWizardScreenLockActivity.java
@@ -140,8 +140,7 @@
switch(position) {
case LockTypeDialogFragment.POSITION_NONE:
if (mPasswordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
- byte[] currLockBytes = mCurrLock != null ? mCurrLock.getBytes() : null;
- new LockPatternUtils(this).clearLock(currLockBytes, UserHandle.myUserId());
+ new LockPatternUtils(this).clearLock(mCurrLock, UserHandle.myUserId());
}
setResult(ResultCodes.RESULT_NONE);
finish();
