commit | 8410049ec2faed92b8d375d1a852d83d6d252626 | [log] [tgz] |
---|---|---|
author | Steven Moreland <smoreland@google.com> | Thu Dec 08 19:06:52 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 19:06:52 2022 +0000 |
tree | cfe1f5ce60dbf80b003390f6e7a9f8a7993fa037 | |
parent | 1959a3e8928c44c7ebdcdcbaa4f2da13ab6fc340 [diff] | |
parent | 1b17202c2d50506193203c1906aeb11e7585aad1 [diff] |
Merge "libbinder_ndk: clarify onBinderDied/unlinkToDeath interaction" am: 5c1459c010 am: d8fbd43e85 am: 1b17202c2d Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2333969 Change-Id: I38bb262b8d18b6282a7dae01d86db61dd0ec2c6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/ndk/include_ndk/android/binder_ibinder.h b/libs/binder/ndk/include_ndk/android/binder_ibinder.h index 4163897..1af2119 100644 --- a/libs/binder/ndk/include_ndk/android/binder_ibinder.h +++ b/libs/binder/ndk/include_ndk/android/binder_ibinder.h
@@ -613,7 +613,8 @@ * * 1. If the binder died, shortly after the call to onBinderDied. * 2. If the binder is explicitly unlinked with AIBinder_unlinkToDeath or - * AIBinder_DeathRecipient_delete. + * AIBinder_DeathRecipient_delete, after any pending onBinderDied calls + * finish. * 3. During or shortly after the AIBinder_linkToDeath call if it returns an error. * * It is guaranteed that the callback is called exactly once for each call to linkToDeath unless the