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

Commit 6b40b59d authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Hold onto linked binder." am: 5e343ea8 

am: 6915a76f

Change-Id: Ib1ab9dc28081d9e911441a3476edfc75c0b6fac6
parents 16fba948 6915a76f

services/surfaceflinger/SurfaceFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -529,9 +529,9 @@ void SurfaceFlinger::bootFinished() 


    // wait patiently for the window manager death

    const String16 name("window");

    sp<IBinder> window(defaultServiceManager()->getService(name));

    if (window != 0) {

        window->linkToDeath(static_cast<IBinder::DeathRecipient*>(this));

    mWindowManager = defaultServiceManager()->getService(name);

    if (mWindowManager != 0) {

        mWindowManager->linkToDeath(static_cast<IBinder::DeathRecipient*>(this));

    }

    sp<IBinder> input(defaultServiceManager()->getService(

            String16("inputflinger")));

services/surfaceflinger/SurfaceFlinger.h

+3 −0
Original line number Diff line number Diff line
@@ -1084,6 +1084,9 @@ private: 
    // either AID_GRAPHICS or AID_SYSTEM.

    status_t CheckTransactCodeCredentials(uint32_t code);



    // to linkToDeath

    sp<IBinder> mWindowManager;



    std::unique_ptr<dvr::VrFlinger> mVrFlinger;

    std::atomic<bool> mVrFlingerRequestsDisplay = false;

    static bool useVrFlinger;