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

Commit e6521602 authored by Fengjiang Li's avatar Fengjiang Li
Browse files

[Memory Leak] Fix leak of rotation button view from AnimatedVectorDrawable and container view 

Add FloatRotationButton#onDestroy() api to
1. clear container view
2. stop AnimatedVectorDrawable and clear the drawable from image view when detached from window

Fix: 424251135
Flag: NONE - released code
Test: manual
Change-Id: I7cc9ed9588ade9e1dde85d21e1b0aa9a2baf17f1
parent 83d205fa

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java

+22 −0
Original line number Diff line number Diff line
@@ -192,6 +192,28 @@ public class FloatingRotationButton implements RotationButton { 
        return true;

    }



    @Override

    public void onDestroy() {

        setRotationButtonController(null);

        setOnClickListener(null);

        setOnHoverListener(null);

        setUpdatesCallback(null);



        if (mKeyButtonContainer.isAttachedToWindow()) {

            mWindowManager.removeViewImmediate(mKeyButtonContainer);

        }



        mKeyButtonView.animate().cancel();

        mAnimatedDrawable.stop();

        mKeyButtonView.setImageDrawable(null);

        // Calling AnimatedDrawable#stop() and ImageView.setImageDrawable(null) above will not let

        // RenderThread clear ref to view (via AnimatedVectorDrawable$VectorDrawableAnimatorRT)

        // quick enough for LeakCanary to ignore the leak. To mute LeakCanary, a workaround is to

        // clear the mKeyButtonView.mParent so that LeakCanary won't complain the leak on

        // mKeyButtonContainer.

        mKeyButtonContainer.removeView(mKeyButtonView);

    }



    @Override

    public boolean isVisible() {

        return mIsShowing;

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButton.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public interface RotationButton { 
    }

    default boolean show() { return false; }

    default boolean hide() { return false; }

    default void onDestroy() {}

    default boolean isVisible() {

        return false;

    }

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java

+1 −4
Original line number Diff line number Diff line
@@ -206,10 +206,7 @@ public class RotationButtonController { 
        if (mRotationButton == null) {

            return;

        }

        mRotationButton.setRotationButtonController(null);

        mRotationButton.setOnClickListener(null);

        mRotationButton.setOnHoverListener(null);

        mRotationButton.setUpdatesCallback(null);

        mRotationButton.onDestroy();

        mRotationButton = null;

    }