summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2023-09-19 20:23:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-19 20:23:45 +0000
commit0e3612674f22c93070ac55d8035e4b8607caa1ec (patch)
tree7a87d2cd1fc1e4065817b04b54700958fa11d776
parentba1dae5b26d4a5a0a29e83670ae96a704d1e1b1d (diff)
parent9a7f6c17408173be19aaec614e61d34b0036c44c (diff)
Merge "libbinder_ndk_unit_test: fix after light install" into main am: 9a7f6c1740
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2755747 Change-Id: I3e84f59f05dc5c3e2ab097d86cff450040decd44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp b/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
index 25b8e975b3..47439b87b0 100644
--- a/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
+++ b/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
@@ -435,7 +435,7 @@ TEST(NdkBinder, GetLazyService) {
TEST(NdkBinder, IsUpdatable) {
bool isUpdatable = AServiceManager_isUpdatableViaApex("android.hardware.light.ILights/default");
- EXPECT_EQ(isUpdatable, false);
+ EXPECT_EQ(isUpdatable, true);
}
TEST(NdkBinder, GetUpdatableViaApex) {
@@ -445,7 +445,7 @@ TEST(NdkBinder, GetUpdatableViaApex) {
[](const char* apexName, void* context) {
*static_cast<std::optional<std::string>*>(context) = apexName;
});
- EXPECT_EQ(updatableViaApex, std::nullopt) << *updatableViaApex;
+ EXPECT_NE(updatableViaApex, std::nullopt) << *updatableViaApex;
}
// This is too slow