From f5924b8eecc1961b221850108619fddc4585c1ed Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Tue, 21 May 2024 21:20:31 +0000 Subject: Check access permission for QuickAccessWalletTile icon. Bug: 290365279 Flag: EXEMPT bugfix Test: tested against POC (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b24d52e9e610dd0cd3e8e81c2286fd37d0abe98b) Merged-In: Ica8cd4f0ba6d3af91594f015cd96dccdb79f5c49 Change-Id: Ica8cd4f0ba6d3af91594f015cd96dccdb79f5c49 --- .../systemui/qs/tiles/QuickAccessWalletTile.java | 27 +++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java index 5f14233f6d0e..dc37bfa41356 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java @@ -16,8 +16,13 @@ package com.android.systemui.qs.tiles; -import static android.graphics.drawable.Icon.TYPE_URI; import static android.provider.Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT; +import static android.graphics.drawable.Icon.TYPE_URI; +import static android.graphics.drawable.Icon.TYPE_URI_ADAPTIVE_BITMAP; +import static android.graphics.drawable.Icon.TYPE_RESOURCE; +import static android.graphics.drawable.Icon.TYPE_BITMAP; +import static android.graphics.drawable.Icon.TYPE_ADAPTIVE_BITMAP; +import static android.graphics.drawable.Icon.TYPE_DATA; import static com.android.systemui.wallet.controller.QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE; @@ -247,11 +252,21 @@ public class QuickAccessWalletTile extends QSTileImpl { return; } mSelectedCard = cards.get(selectedIndex); - android.graphics.drawable.Icon cardImageIcon = mSelectedCard.getCardImage(); - if (cardImageIcon.getType() == TYPE_URI) { - mCardViewDrawable = null; - } else { - mCardViewDrawable = mSelectedCard.getCardImage().loadDrawable(mContext); + switch (mSelectedCard.getCardImage().getType()) { + case TYPE_URI: + case TYPE_URI_ADAPTIVE_BITMAP: + mCardViewDrawable = null; + break; + case TYPE_RESOURCE: + case TYPE_BITMAP: + case TYPE_ADAPTIVE_BITMAP: + case TYPE_DATA: + mCardViewDrawable = mSelectedCard.getCardImage().loadDrawable(mContext); + break; + default: + Log.e(TAG, "Unknown icon type: " + mSelectedCard.getCardImage().getType()); + mCardViewDrawable = null; + break; } refreshState(); } -- cgit v1.2.3-59-g8ed1b