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

Commit ac0f18dc authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug where MenuItems would not return consistent results for item... 

Merge "Fix a bug where MenuItems would not return consistent results for item icons initialized from a drawable resource id."
parents ab750c5e c4852a37

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

+4 −1
Original line number Diff line number Diff line
@@ -382,7 +382,10 @@ public final class MenuItemImpl implements MenuItem { 
        }



        if (mIconResId != NO_ICON) {

            return mMenu.getResources().getDrawable(mIconResId);

            Drawable icon =  mMenu.getResources().getDrawable(mIconResId);

            mIconResId = NO_ICON;

            mIconDrawable = icon;

            return icon;

        }

        

        return null;