Skip to content

Commit 16117cd

Browse files
Steven Morelandandroid-build-merge-worker-robot
authored andcommitted
Merge "libbinder: also avaid sWarningCallback lock" into main am: a26652b am: acc353d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3308937 Change-Id: Ib2956e3d496cef8c8cdd11484a045d83d4d9a4ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents bce23a6 + acc353d commit 16117cd

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

libs/binder/BpBinder.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ sp<BpBinder> BpBinder::create(int32_t handle, std::function<void()>* postTask) {
197197
&& currentValue < sBinderProxyCountHighWatermark
198198
&& ((trackedValue & WARNING_REACHED_MASK) == 0)) [[unlikely]] {
199199
sTrackingMap[trackedUid] |= WARNING_REACHED_MASK;
200-
if (sWarningCallback) sWarningCallback(trackedUid);
200+
if (sWarningCallback) {
201+
*postTask = [=]() { sWarningCallback(trackedUid); };
202+
}
201203
} else if (currentValue >= sBinderProxyCountHighWatermark) {
202204
ALOGE("Too many binder proxy objects sent to uid %d from uid %d (%d proxies held)",
203205
getuid(), trackedUid, trackedValue);

0 commit comments

Comments
 (0)