commit 8453178f183cbb62b1a00a79db70aad64a08cfde
author Ilya Matyukhin <ilyamaty@google.com> Mon Oct 31 02:29:43 2022 +0000
committer Ilya Matyukhin <ilyamaty@google.com> Fri Nov 18 06:37:09 2022 +0000
tree 3a55630e95fde0333c6b513888100c3e5907f82c
parent 6d884accfee5fd9c9d260391b81c1962cbc6a8c1

Add @hide to the biometric interfaces

This change allows the framework to depend on biometric AIDL types, for
example: `android.hardware.biometrics.fingerprint.PointerContext`.

The dependency can be introduced with a `-java-source` target, for
example: `:android.hardware.biometrics.common-V3-java-source`.

The "@hide" annotation informs Metalava that these types are not a
public API (not part of the SDK).

Bug: 218388821
Test: m android.hardware.biometrics.common-update-api
Test: m android.hardware.biometrics.face-update-api
Test: m android.hardware.biometrics.fingerprint-update-api
Change-Id: Ib3327594c64dbb800b9d1744869ceb490d63e553

biometrics/face/aidl/default/Android.bp

diff --git a/biometrics/face/aidl/default/Android.bp b/biometrics/face/aidl/default/Android.bp
index 63a3645..876a91f 100644
--- a/biometrics/face/aidl/default/Android.bp
+++ b/biometrics/face/aidl/default/Android.bp
@@ -16,8 +16,8 @@
     shared_libs: [
         "libbase",
         "libbinder_ndk",
-        "android.hardware.biometrics.face-V2-ndk",
-        "android.hardware.biometrics.common-V2-ndk",
+        "android.hardware.biometrics.face-V3-ndk",
+        "android.hardware.biometrics.common-V3-ndk",
         "android.hardware.biometrics.common.thread",
         "android.hardware.biometrics.common.util",
     ],
@@ -49,9 +49,9 @@
     ],
     static_libs: [
         "libandroid.hardware.biometrics.face.VirtualProps",
-        "android.hardware.biometrics.face-V2-ndk",
-        "android.hardware.biometrics.common-V2-ndk",
-        "android.hardware.keymaster-V3-ndk",
+        "android.hardware.biometrics.face-V3-ndk",
+        "android.hardware.biometrics.common-V3-ndk",
+        "android.hardware.keymaster-V4-ndk",
         "android.hardware.biometrics.common.util",
     ],
     vendor: true,

biometrics/face/aidl/default/face-default.xml

diff --git a/biometrics/face/aidl/default/face-default.xml b/biometrics/face/aidl/default/face-default.xml
index e6ef842..8f2fbb8 100644
--- a/biometrics/face/aidl/default/face-default.xml
+++ b/biometrics/face/aidl/default/face-default.xml
@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.biometrics.face</name>
-        <version>2</version>
+        <version>3</version>
         <fqname>IFace/default</fqname>
     </hal>
 </manifest>