diff options
| author | 2024-09-17 23:27:25 +0000 | |
|---|---|---|
| committer | 2024-09-17 23:27:25 +0000 | |
| commit | 239a9e86a2af6cfe4e056bfeecbd67ef198f68df (patch) | |
| tree | 42e53f727f2308b8680eaeb0b0c0c81fe8c383a3 | |
| parent | b9b45af8a7462387a9ece65a36546ad7b9976ccb (diff) | |
| parent | 5a7b160272b47405b20d0793a8aca7b4d69cf4a5 (diff) | |
Merge "Fix Libbinder RemoveFromCacheOnServerDeath test" into main am: 2347908d77 am: 5a7b160272
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3267720
Change-Id: I2958e617eec428a55d9da5dbcca7f1cd5c01317b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/tests/binderCacheUnitTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/tests/binderCacheUnitTest.cpp b/libs/binder/tests/binderCacheUnitTest.cpp index 92dab19a63..482d197688 100644 --- a/libs/binder/tests/binderCacheUnitTest.cpp +++ b/libs/binder/tests/binderCacheUnitTest.cpp @@ -137,9 +137,9 @@ TEST_F(LibbinderCacheTest, RemoveFromCacheOnServerDeath) { ASSERT_EQ(binder1, result); // Kill the server, this should remove from cache. - foo.killServer(binder1); pid_t pid; ASSERT_EQ(OK, binder1->getDebugPid(&pid)); + foo.killServer(binder1); system(("kill -9 " + std::to_string(pid)).c_str()); sp<IBinder> binder2 = sp<BBinder>::make(); |