Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acc353de authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: also avaid sWarningCallback lock" into main am: a26652b0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3308937



Change-Id: Ibb2f43891fe19983a64f2a02bd7b5907ce7295e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9f3cebd a26652b0

libs/binder/BpBinder.cpp

+3 −1
Original line number Diff line number Diff line
@@ -197,7 +197,9 @@ sp<BpBinder> BpBinder::create(int32_t handle, std::function<void()>* postTask) { 
                    && currentValue < sBinderProxyCountHighWatermark

                    && ((trackedValue & WARNING_REACHED_MASK) == 0)) [[unlikely]] {

                sTrackingMap[trackedUid] |= WARNING_REACHED_MASK;

                if (sWarningCallback) sWarningCallback(trackedUid);

                if (sWarningCallback) {

                    *postTask = [=]() { sWarningCallback(trackedUid); };

                }

            } else if (currentValue >= sBinderProxyCountHighWatermark) {

                ALOGE("Too many binder proxy objects sent to uid %d from uid %d (%d proxies held)",

                      getuid(), trackedUid, trackedValue);