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

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

Merge "libbinder: only set sm stability if non-null" am: 7ac860e5 am: 99c72813 am: cc45cabc 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If71c9cecbdae738c588bb3e559b5ed380fe359bb
parents b973403c cc45cabc

libs/binder/ProcessState.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -124,13 +124,13 @@ sp<IBinder> ProcessState::getContextObject(const sp<IBinder>& /*caller*/) 
{

{

    sp<IBinder> context = getStrongProxyForHandle(0);

    sp<IBinder> context = getStrongProxyForHandle(0);





    if (context == nullptr) {

    if (context) {

       ALOGW("Not able to get context object on %s.", mDriverName.c_str());

    }



        // The root object is special since we get it directly from the driver, it is never

        // The root object is special since we get it directly from the driver, it is never

        // written by Parcell::writeStrongBinder.

        // written by Parcell::writeStrongBinder.

        internal::Stability::markCompilationUnit(context.get());

        internal::Stability::markCompilationUnit(context.get());

    } else {

        ALOGW("Not able to get context object on %s.", mDriverName.c_str());

    }





    return context;

    return context;

}

}