Skip to content

Commit ea332b7

Browse files
Steven MorelandGerrit Code Review
authored andcommitted
Merge changes from topic "refbase-lar" into main
* changes: opengl stubs: update for no implicit sp libgui InputTransferToken: avoid implicit sp<>
2 parents 3f11c43 + 4f8ce35 commit ea332b7

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

libs/gui/include/gui/InputTransferToken.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
namespace android {
2626
struct InputTransferToken : public RefBase, Parcelable {
2727
public:
28-
InputTransferToken() { mToken = new BBinder(); }
28+
InputTransferToken() { mToken = sp<BBinder>::make(); }
2929

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

@@ -50,4 +50,4 @@ static inline bool operator==(const sp<InputTransferToken>& token1,
5050
return token1->mToken == token2->mToken;
5151
}
5252

53-
} // namespace android
53+
} // namespace android

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ android_eglCreateWindowSurfaceTexture
113113
if (producer == NULL)
114114
goto not_valid_surface;
115115

116-
window = new android::Surface(producer, true);
116+
window = android::sp<android::Surface>::make(producer, true);
117117

118118
if (window == NULL)
119119
goto not_valid_surface;

0 commit comments

Comments
 (0)