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

Commit 40e361cb authored by chaviw's avatar chaviw
Browse files

Lock in Surface#destroy 

Previously, destroy just directly called release, which was already
locked. Now, destroy invokes some functions in native. This means if
another thread is calling release during the destroy call, it could
cause crashes.

Test: Hard to repro bug
Bug: 223412469
Change-Id: Ie6415f505bbc86505e3fe3ea2a0bea96a3e78ad3
parent c0ba8299

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