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

Commit d644facf authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 

* commit 'f408656a':
  Re-allow suppressing onDetachedFromWindow
parents 8628387c f408656a

core/java/android/view/SurfaceView.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -256,9 +256,8 @@ public class SurfaceView extends View { 
        updateWindow(false, false);

        updateWindow(false, false);

    }

    }





    /** @hide */

    @Override

    @Override

    protected void onDetachedFromWindowInternal() {

    protected void onDetachedFromWindow() {

        if (mGlobalListenersAdded) {

        if (mGlobalListenersAdded) {

            ViewTreeObserver observer = getViewTreeObserver();

            ViewTreeObserver observer = getViewTreeObserver();

            observer.removeOnScrollChangedListener(mScrollChangedListener);

            observer.removeOnScrollChangedListener(mScrollChangedListener);
@@ -280,7 +279,7 @@ public class SurfaceView extends View { 
        mSession = null;

        mSession = null;

        mLayout.token = null;

        mLayout.token = null;





        super.onDetachedFromWindowInternal();

        super.onDetachedFromWindow();

    }

    }





    @Override

    @Override

opengl/java/android/opengl/GLSurfaceView.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -595,9 +595,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
        mDetached = false;

        mDetached = false;

    }

    }





    /** @hide */

    @Override

    @Override

    protected void onDetachedFromWindowInternal() {

    protected void onDetachedFromWindow() {

        if (LOG_ATTACH_DETACH) {

        if (LOG_ATTACH_DETACH) {

            Log.d(TAG, "onDetachedFromWindow");

            Log.d(TAG, "onDetachedFromWindow");

        }

        }
@@ -605,7 +604,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
            mGLThread.requestExitAndWait();

            mGLThread.requestExitAndWait();

        }

        }

        mDetached = true;

        mDetached = true;

        super.onDetachedFromWindowInternal();

        super.onDetachedFromWindow();

    }

    }





    // ----------------------------------------------------------------------

    // ----------------------------------------------------------------------