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

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

Merge "libbinder: ~BBinder checks for all values" am: ddcb34e0 am:... 

Merge "libbinder: ~BBinder checks for all values" am: ddcb34e0 am: 2c7a0602 am: d07469c8 am: 618044fa

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



Change-Id: I45ccc87ccd84ebae4839f4ea4844406d421b0feb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94ec4e95 618044fa

libs/binder/Binder.cpp

+16 −2
Original line number Original line Diff line number Diff line
@@ -610,9 +610,23 @@ void BBinder::removeRpcServerLink(const sp<RpcServerLink>& link) { 




BBinder::~BBinder()

BBinder::~BBinder()

{

{

    if (!wasParceled() && getExtension()) {

    if (!wasParceled()) {

        if (getExtension()) {

             ALOGW("Binder %p destroyed with extension attached before being parceled.", this);

             ALOGW("Binder %p destroyed with extension attached before being parceled.", this);

        }

        }

        if (isRequestingSid()) {

             ALOGW("Binder %p destroyed when requesting SID before being parceled.", this);

        }

        if (isInheritRt()) {

             ALOGW("Binder %p destroyed after setInheritRt before being parceled.", this);

        }

        if (getMinSchedulerPolicy() != SCHED_NORMAL) {

             ALOGW("Binder %p destroyed after setMinSchedulerPolicy before being parceled.", this);

        }

        if (getMinSchedulerPriority() != 0) {

             ALOGW("Binder %p destroyed after setMinSchedulerPolicy before being parceled.", this);

        }

    }





    Extras* e = mExtras.load(std::memory_order_relaxed);

    Extras* e = mExtras.load(std::memory_order_relaxed);

    if (e) delete e;

    if (e) delete e;