commit 90a305232ed8ecc56d211b8f342e75f1e3148c4a
author Eric Biggers <ebiggers@google.com> Tue Jan 25 19:21:37 2022 +0000
committer Eric Biggers <ebiggers@google.com> Tue Mar 15 01:26:08 2022 +0000
tree 3f6974685d73894f8c07605028c4eb986cd1de2e
parent c1b4ce01f8dd4addd7a250ca481b20ed1a5d854d

Remove HardwareAuthToken parameters from binder interface

These are no longer used.

Test: atest com.android.server.locksettings
Bug: 184723544
Change-Id: I6160d30deb138a5366532de84cbf6f02cbc69b8c
(cherry picked from commit 5bb9faab49e2bd7872e2d8b4ada6be89df7758fb)
Merged-In: I6160d30deb138a5366532de84cbf6f02cbc69b8c

binder/android/os/IVold.aidl

diff --git a/binder/android/os/IVold.aidl b/binder/android/os/IVold.aidl
index cec0593..aee75f5 100644
--- a/binder/android/os/IVold.aidl
+++ b/binder/android/os/IVold.aidl
@@ -100,15 +100,12 @@
     void createUserKey(int userId, int userSerial, boolean ephemeral);
     void destroyUserKey(int userId);
 
-    void addUserKeyAuth(int userId, int userSerial, @utf8InCpp String token,
-                        @utf8InCpp String secret);
-    void clearUserKeyAuth(int userId, int userSerial, @utf8InCpp String token,
-                        @utf8InCpp String secret);
+    void addUserKeyAuth(int userId, int userSerial, @utf8InCpp String secret);
+    void clearUserKeyAuth(int userId, int userSerial, @utf8InCpp String secret);
     void fixateNewestUserKeyAuth(int userId);
 
     int[] getUnlockedUsers();
-    void unlockUserKey(int userId, int userSerial, @utf8InCpp String token,
-                       @utf8InCpp String secret);
+    void unlockUserKey(int userId, int userSerial, @utf8InCpp String secret);
     void lockUserKey(int userId);
 
     void prepareUserStorage(@nullable @utf8InCpp String uuid, int userId, int userSerial,