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

Commit e3f6f95c authored by Jacqueline Bronger's avatar Jacqueline Bronger Committed by Android (Google) Code Review
Browse files

Merge "TV PiP: don't load app provided icon from URI" into main

parents d5688567 bdc1c02d

libs/WindowManager/Shell/src/com/android/wm/shell/common/TvWindowMenuActionButton.java

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ public class TvWindowMenuActionButton extends RelativeLayout { 
        mCurrentIcon = icon;

        // Remove old image while waiting for the new one to load.

        mIconImageView.setImageDrawable(null);

        if (icon.getType() == Icon.TYPE_URI || icon.getType() == Icon.TYPE_URI_ADAPTIVE_BITMAP) {

            // Disallow loading icon from content URI

            return;

        }

        icon.loadDrawableAsync(mContext, d -> {

            // The image hasn't been set any other way and the drawable belongs to the most

            // recently set Icon.