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

Commit ea332b76 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes from topic "refbase-lar" into main 

* changes:
  opengl stubs: update for no implicit sp
  libgui InputTransferToken: avoid implicit sp<>
parents 3f11c43f 4f8ce353

libs/gui/include/gui/InputTransferToken.h

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
namespace android {

struct InputTransferToken : public RefBase, Parcelable {

public:

    InputTransferToken() { mToken = new BBinder(); }

    InputTransferToken() { mToken = sp<BBinder>::make(); }



    InputTransferToken(const sp<IBinder>& token) { mToken = token; }

opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ not_valid_surface: 
    if (producer == NULL)

        goto not_valid_surface;



    window = new android::Surface(producer, true);

    window = android::sp<android::Surface>::make(producer, true);



    if (window == NULL)

        goto not_valid_surface;