commit 8381fb71bb9b73026e0e29a3d151b69e5050f288
author Jeff Pu <jeffpu@google.com> Thu Jan 30 05:29:59 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 30 05:29:59 2025 -0800
tree ddbf4b1c73676c3a1f3ca10817ab5a248f3b0007
parent 465d13f0bbea8c03228d78b04639e708b84eab12
parent 6ba70a44e1244df157df8e1a13ed2e08aa8dcddd

Merge changes I9bd12ff0,Ic842a341 into main

* changes:
  Enable framework during vts test
  Stop framework during vts test

biometrics/face/aidl/vts/Android.bp

diff --git a/biometrics/face/aidl/vts/Android.bp b/biometrics/face/aidl/vts/Android.bp
index e037eac..1b3a93a 100644
--- a/biometrics/face/aidl/vts/Android.bp
+++ b/biometrics/face/aidl/vts/Android.bp
@@ -28,4 +28,5 @@
         "general-tests",
         "vts",
     ],
+    disable_framework: false,
 }

biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp

diff --git a/biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp b/biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp
index 08ab5d6..686f61e 100644
--- a/biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp
+++ b/biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp
@@ -186,6 +186,7 @@
 
     void TearDown() override {
         // Close the mSession.
+        ASSERT_NE(mSession, nullptr);
         ASSERT_TRUE(mSession->close().isOk());
 
         // Make sure the mSession is closed.

biometrics/fingerprint/aidl/vts/Android.bp

diff --git a/biometrics/fingerprint/aidl/vts/Android.bp b/biometrics/fingerprint/aidl/vts/Android.bp
index 7c9cd8c..2b4f657 100644
--- a/biometrics/fingerprint/aidl/vts/Android.bp
+++ b/biometrics/fingerprint/aidl/vts/Android.bp
@@ -27,5 +27,5 @@
         "general-tests",
         "vts",
     ],
-    disable_framework: true,
+    disable_framework: false,
 }