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

Commit 46bf587a authored by Huihong Luo's avatar Huihong Luo Committed by Automerger Merge Worker
Browse files

Merge "Add ASurfaceControl_acquire api" into sc-dev am: 98039ded 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13548126

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I288b36ffc7494b44b37527bc98cdafa2c90d645a
parents 89f00e46 98039ded

native/android/libandroid.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ LIBANDROID { 
    AStorageManager_unmountObb;

    ASurfaceControl_create; # introduced=29

    ASurfaceControl_createFromWindow; # introduced=29

    ASurfaceControl_acquire; # introduced=31

    ASurfaceControl_release; # introduced=29

    ASurfaceTexture_acquireANativeWindow; # introduced=28

    ASurfaceTexture_attachToGLContext; # introduced=28

native/android/surface_control.cpp

+8 −2
Original line number Diff line number Diff line
@@ -185,10 +185,16 @@ ASurfaceControl* ASurfaceControl_create(ASurfaceControl* parent, const char* deb 
    return reinterpret_cast<ASurfaceControl*>(surfaceControl.get());

}



void ASurfaceControl_acquire(ASurfaceControl* aSurfaceControl) {

    SurfaceControl* surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);



    SurfaceControl_acquire(surfaceControl);

}



void ASurfaceControl_release(ASurfaceControl* aSurfaceControl) {

    sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);

    SurfaceControl* surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);



    SurfaceControl_release(surfaceControl.get());

    SurfaceControl_release(surfaceControl);

}



ASurfaceTransaction* ASurfaceTransaction_create() {