commit 3eed51d6b6c0e32be6a1fee734d281ab93ae761b
author Jeff Pu <jeffpu@google.com> Fri Jan 24 12:51:26 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 24 12:51:26 2025 -0800
tree b8a3b0dbd666852c12715713696cf2fef20911f6
parent 6ac537c4fd145d604f9e49c79dc4555ae1f55aba
parent 27e3792599740d53547a4a99ab225d3d304ca91d

Merge "Stop framework during vts test" into main

biometrics/fingerprint/aidl/vts/Android.bp

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

biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp

diff --git a/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp b/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
index 1cd8c76..2cc5e56 100644
--- a/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
+++ b/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
@@ -167,6 +167,7 @@
 
     void TearDown() override {
         // Close the mSession.
+        ASSERT_NE(mSession, nullptr);
         ASSERT_TRUE(mSession->close().isOk());
 
         // Make sure the mSession is closed.