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

Commit 2bc8485b authored by Chris Banes's avatar Chris Banes Committed by Android (Google) Code Review
Browse files

Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev

parents 8a752abe c8f6ecc2

core/java/android/view/ActionProvider.java

+8 −0
Original line number Diff line number Diff line
@@ -236,6 +236,14 @@ public abstract class ActionProvider { 
        mVisibilityListener = listener;

    }



    /**

     * @hide

     */

    public void reset() {

        mVisibilityListener = null;

        mSubUiVisibilityListener = null;

    }



    /**

     * @hide Internal use only

     */

core/java/com/android/internal/view/menu/MenuItemImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ public final class MenuItemImpl implements MenuItem { 


    public MenuItem setActionProvider(ActionProvider actionProvider) {

        if (mActionProvider != null) {

            mActionProvider.setVisibilityListener(null);

            mActionProvider.reset();

        }

        mActionView = null;

        mActionProvider = actionProvider;