diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:47:02 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:47:02 +0000 |
commit | 9a4729e0cd7f9f5487980086dbad9f1cc981a0a1 (patch) | |
tree | fcaa6753977be61919cea5cebb4a0275453779e6 | |
parent | 3af269e1c45a3bd2b02f8c6249391633c4055772 (diff) | |
parent | 9f64f1e37a10e5e56b299ac0e464de45c0066961 (diff) | |
download | setupwizard-android14-mainline-art-release.tar.gz |
Snap for 10453563 from 9f64f1e37a10e5e56b299ac0e464de45c0066961 to mainline-art-releaseaml_art_341711000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060android14-mainline-art-release
Change-Id: I1183119b2292df9bf682308fbd4df90fbfa727c4
3 files changed, 20 insertions, 2 deletions
diff --git a/library/main/build.gradle b/library/main/build.gradle index 17ab59a..8af3194 100644 --- a/library/main/build.gradle +++ b/library/main/build.gradle @@ -82,5 +82,5 @@ dependencies { testImplementation 'com.google.truth:truth:0.41' testImplementation 'org.mockito:mockito-core:3.6.0' - testImplementation 'org.robolectric:robolectric:4.5.1' + testImplementation 'org.robolectric:robolectric:4.8.2' } diff --git a/library/utils/src/com/android/car/setupwizardlib/IInitialLockSetupService.aidl b/library/utils/src/com/android/car/setupwizardlib/IInitialLockSetupService.aidl index 305195b..3cc4bd4 100644 --- a/library/utils/src/com/android/car/setupwizardlib/IInitialLockSetupService.aidl +++ b/library/utils/src/com/android/car/setupwizardlib/IInitialLockSetupService.aidl @@ -44,5 +44,19 @@ interface IInitialLockSetupService { * deserializable by the service. */ int setLock(in int lockType, in byte[] password) = 3; + + /** + * Added in LIBRARY_VERSION = 2. + * + * Returns a message String combing all input validation error messages to + * directly display to user. If there is no error and the credentialBytes + * is valid then it will return an empty String. The String returned should + * be the same message as shown to users in the Security Settings page + * and should be properly localized. + + * @param credentialBytes input value in bytes representing one of + * Password, PIN, or Pattern input. + */ + String checkValidLockAndReturnError(in int lockType, in byte[] credentialBytes) = 4; } diff --git a/library/utils/src/com/android/car/setupwizardlib/InitialLockSetupConstants.java b/library/utils/src/com/android/car/setupwizardlib/InitialLockSetupConstants.java index 8ca5c6e..7362cd1 100644 --- a/library/utils/src/com/android/car/setupwizardlib/InitialLockSetupConstants.java +++ b/library/utils/src/com/android/car/setupwizardlib/InitialLockSetupConstants.java @@ -27,8 +27,12 @@ public interface InitialLockSetupConstants { /** * The library version. All relevant changes should bump this version number and ensure * all relevant parts of the interface handle backwards compatibility. + * + * Library version 1: Initial implementation + * Library version 2: Add API checkValidLockAndReturnError to allow complexity validation + * error to be retrieved from Settings. */ - int LIBRARY_VERSION = 1; + int LIBRARY_VERSION = 2; /** * Lock types supported by the InitialLockSetupService. |