Snap for 9727520 from f212a943a38bbdaa0d6488ab4d540f7c04dfd337 to tm-qpr3-releaseandroid-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-release

Change-Id: Ie0df0ca569e2d76fb357e19523d9ab2ad7d88f3d

2 files changed, 19 insertions, 1 deletions

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.