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

Commit 1aee6560 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Disallow loading icon from content URI to PipMenu 

Bug: 278246904
Test: manually, with the PoC app attached to the bug
Merged-In: Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e 
Change-Id: Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e
parent fb273984

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java

+14 −7
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.content.Intent; 
import android.graphics.Color;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;
@@ -509,6 +510,11 @@ public class PipMenuView extends FrameLayout { 
                    final boolean isCloseAction = mCloseAction != null && Objects.equals(

                            mCloseAction.getActionIntent(), action.getActionIntent());



                    final int iconType = action.getIcon().getType();

                    if (iconType == Icon.TYPE_URI || iconType == Icon.TYPE_URI_ADAPTIVE_BITMAP) {

                        // Disallow loading icon from content URI

                        actionView.setImageDrawable(null);

                    } else {

                        // TODO: Check if the action drawable has changed before we reload it

                        action.getIcon().loadDrawableAsync(mContext, d -> {

                            if (d != null) {
@@ -516,6 +522,7 @@ public class PipMenuView extends FrameLayout { 
                                actionView.setImageDrawable(d);

                            }

                        }, mMainHandler);

                    }

                    actionView.setCustomCloseBackgroundVisibility(

                            isCloseAction ? View.VISIBLE : View.GONE);

                    actionView.setContentDescription(action.getContentDescription());