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

Commit 62ccaabe authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Lock in Surface#destroy" into tm-dev am: 15591134 

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



Change-Id: I6d3c713b74465a15dd15a14b10ca3d3fd32ed79b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4bbecf5 15591134

core/java/android/view/Surface.java

+5 −3
Original line number Diff line number Diff line
@@ -341,11 +341,13 @@ public class Surface implements Parcelable { 
     */

    @UnsupportedAppUsage

    public void destroy() {

        synchronized (mLock) {

            if (mNativeObject != 0) {

                nativeDestroy(mNativeObject);

            }

            release();

        }

    }



    /**

     * Destroys the HwuiContext without completely