mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-09-30 05:05:47 +00:00
af360bc9ea
wgetc873988898.patch -O telecomm-01.patch wget0fb5786dbf.patch -O mediaprovider-01.patch wget1a4b9ef510.patch -O wifi-01.patch wget364a1d9962.patch -O bluetooth-01.patch wget87a06448b9.patch -O settings-01.patch wgetaaba724a68.patch -O settings-02.patch wget507304e1f5.patch -O native-01.patch wget89489ff5dd.patch -O base-01.patch wgetd1765c4715.patch -O base-02.patch wgetcbb1a0ecd6.patch -O base-03.patch wget4725772c0b.patch -O base-04.patch wget19747f6923.patch -O base-05.patch wgete7a1aa9ed0.patch -O base-06.patch wget922a7860b1.patch -O base-07.patch wgeted183ed912.patch -O base-08.patch wgetc6fbe1330a.patch -O base-09.patch wget9141cac175.patch -O base-10.patch wget41235bcc67.patch -O av-01.patch wgeta89f704701.patch -O av-02.patch wget6d7cd80d77.patch -O av-03.patch wget75fc175a08.patch -O av-04.patch wgetb023ec300f.patch -O av-05.patch wgetc8117d1539.patch -O av-06.patch wgetf06d23d824.patch -O av-07.patch wget9c7408ab07.patch -O av-08.patch wgetcfbfcefb3c.patch -O launcher-01.patch wget4a27a7f162.patch -O libxml-01.patch Signed-off-by: Tad <tad@spotco.us>
54 lines
2.8 KiB
Diff
54 lines
2.8 KiB
Diff
From e7a1aa9ed0bc69853bc83d098e15b8fa3b1881b4 Mon Sep 17 00:00:00 2001
|
|
From: Hongwei Wang <hwwang@google.com>
|
|
Date: Thu, 25 May 2023 12:18:44 -0700
|
|
Subject: [PATCH] Disallow loading icon from content URI to PipMenu
|
|
|
|
Bug: 278246904
|
|
Test: manually, with the PoC app attached to the bug
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1aee65603e262affd815fa53dcc5416c605e4037)
|
|
Merged-In: Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e
|
|
Change-Id: Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e
|
|
---
|
|
.../wm/shell/pip/phone/PipMenuView.java | 21 ++++++++++++-------
|
|
1 file changed, 14 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
|
|
index 167c0321d3ad..779c539a2097 100644
|
|
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
|
|
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
|
|
@@ -45,6 +45,7 @@
|
|
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;
|
|
@@ -513,13 +514,19 @@ private void updateActionViews(int menuState, Rect stackBounds) {
|
|
final boolean isCloseAction = mCloseAction != null && Objects.equals(
|
|
mCloseAction.getActionIntent(), action.getActionIntent());
|
|
|
|
- // TODO: Check if the action drawable has changed before we reload it
|
|
- action.getIcon().loadDrawableAsync(mContext, d -> {
|
|
- if (d != null) {
|
|
- d.setTint(Color.WHITE);
|
|
- actionView.setImageDrawable(d);
|
|
- }
|
|
- }, mMainHandler);
|
|
+ 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) {
|
|
+ d.setTint(Color.WHITE);
|
|
+ actionView.setImageDrawable(d);
|
|
+ }
|
|
+ }, mMainHandler);
|
|
+ }
|
|
actionView.setCustomCloseBackgroundVisibility(
|
|
isCloseAction ? View.VISIBLE : View.GONE);
|
|
actionView.setContentDescription(action.getContentDescription());
|