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

Commit bac16fae authored by Bart Sears's avatar Bart Sears
Browse files

Revert "Workaround apps not calling super.onDetachedFromWindow()" 

Requested by jreck to fix the build.

This reverts commit 198d2084.

Change-Id: I733065cc124b59bf914034f5bac5e2e951a5b604
parent 198d2084

core/java/android/view/SurfaceView.java

+2 −2
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public class SurfaceView extends View { 
    }



    @Override

    protected void onDetachedFromWindowInternal() {

    protected void onDetachedFromWindow() {

        if (mGlobalListenersAdded) {

            ViewTreeObserver observer = getViewTreeObserver();

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

        mLayout.token = null;



        super.onDetachedFromWindowInternal();

        super.onDetachedFromWindow();

    }



    @Override

core/java/android/view/TextureView.java

+2 −2
Original line number Diff line number Diff line
@@ -229,9 +229,9 @@ public class TextureView extends View { 
    }



    @Override

    protected void onDetachedFromWindowInternal() {

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        destroySurface();

        super.onDetachedFromWindowInternal();

    }



    private void destroySurface() {

core/java/android/view/View.java

+0 −14
Original line number Diff line number Diff line
@@ -13110,19 +13110,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @see #onAttachedToWindow()

     */

    protected void onDetachedFromWindow() {

    }













    /**













     * This is a framework-internal mirror of onDetachedFromWindow() that's called













     * after onDetachedFromWindow().













     *













     * If you override this you *MUST* call super.onDetachedFromWindowInternal()!













     * The super method should be called at the end of the overriden method to ensure













     * subclasses are destroyed first













     *













     * @hide













     */













    protected void onDetachedFromWindowInternal() {















        mPrivateFlags &= ~PFLAG_CANCEL_NEXT_UP_EVENT;















        mPrivateFlags3 &= ~PFLAG3_IS_LAID_OUT;
























@@ -13310,7 +13297,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        }





























        onDetachedFromWindow();













        onDetachedFromWindowInternal();





























        ListenerInfo li = mListenerInfo;















        final CopyOnWriteArrayList<OnAttachStateChangeListener> listeners =

































core/java/android/widget/TextView.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -4730,7 +4730,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener













    }































    @Override













    protected void onDetachedFromWindowInternal() {













    protected void onDetachedFromWindow() {













        super.onDetachedFromWindow();





























        if (mPreDrawRegistered) {















            getViewTreeObserver().removeOnPreDrawListener(this);















            mPreDrawRegistered = false;









@@ -4739,8 +4741,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener













        resetResolvedDrawables();































        if (mEditor != null) mEditor.onDetachedFromWindow();



























        super.onDetachedFromWindowInternal();















    }































    @Override

































opengl/java/android/opengl/GLSurfaceView.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -601,7 +601,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback













     * Must not be called before a renderer has been set.















     */















    @Override













    protected void onDetachedFromWindowInternal() {













    protected void onDetachedFromWindow() {















        if (LOG_ATTACH_DETACH) {















            Log.d(TAG, "onDetachedFromWindow");















        }









@@ -609,7 +609,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback













            mGLThread.requestExitAndWait();















        }















        mDetached = true;













        super.onDetachedFromWindowInternal();













        super.onDetachedFromWindow();















    }































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