commit 3f566581b005df5f2c77f4d7a28ff33e2bf7d964
author Mayank Garg <gargmayank@google.com> Fri Oct 02 22:10:16 2020 -0700
committer Mayank Garg <gargmayank@google.com> Mon Nov 09 22:38:23 2020 -0800
tree 8674186324eae087e7d9cbb0adc82ebdcf340b5c
parent 72aba807e5051e8fb7bd549f7d307553d6ca61f7

Added user authentication association enums to CarUserManager

Bug: 169288092
Test: atest CarUserManagerUnitTest
Change-Id: Id52764bc218c6af45483fc062c5be94f10239424

service/src/com/android/car/user/CarUserService.java

diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 15c8e6f..f56d7e6 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -37,6 +37,8 @@
 import android.car.drivingstate.CarUxRestrictions;
 import android.car.settings.CarSettings;
 import android.car.user.CarUserManager;
+import android.car.user.CarUserManager.UserIdentificationAssociationSetValue;
+import android.car.user.CarUserManager.UserIdentificationAssociationType;
 import android.car.user.CarUserManager.UserLifecycleEvent;
 import android.car.user.CarUserManager.UserLifecycleListener;
 import android.car.user.UserCreationResult;
@@ -1332,7 +1334,8 @@
     }
 
     @Override
-    public UserIdentificationAssociationResponse getUserIdentificationAssociation(int[] types) {
+    public UserIdentificationAssociationResponse getUserIdentificationAssociation(
+            @UserIdentificationAssociationType int[] types) {
         if (!isUserHalUserAssociationSupported()) {
             return UserIdentificationAssociationResponse.forFailure(VEHICLE_HAL_NOT_SUPPORTED);
         }
@@ -1370,7 +1373,9 @@
     }
 
     @Override
-    public void setUserIdentificationAssociation(int timeoutMs, int[] types, int[] values,
+    public void setUserIdentificationAssociation(int timeoutMs,
+            @UserIdentificationAssociationType int[] types,
+            @UserIdentificationAssociationSetValue int[] values,
             AndroidFuture<UserIdentificationAssociationResponse> result) {
         if (!isUserHalUserAssociationSupported()) {
             result.complete(