Snap for 10094917 from 8839c731cf0bb3f1cc449d4a1b4dfaee889a39a0 to udc-qpr1-releaseandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release

Change-Id: I01b787376d0e615cef66fdc58fb3972e2c2ac88d

1 files changed, 9 insertions, 1 deletions

diff --git a/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewController.java b/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewController.java
index 22165d4..4e9ce4f 100644
--- a/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewController.java
+++ b/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewController.java
@@ -24,6 +24,7 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Handler;
+import android.os.UserHandle;
 import android.os.Looper;
 import android.service.quickaccesswallet.GetWalletCardsError;
 import android.service.quickaccesswallet.GetWalletCardsRequest;
@@ -361,7 +362,14 @@ public class WalletPanelViewController implements
          */
         QAWalletCardViewInfo(WalletCard walletCard) {
             mWalletCard = walletCard;
-            mCardDrawable = mWalletCard.getCardImage().loadDrawable(mPluginContext);
+            Icon cardImage = mWalletCard.getCardImage();
+            if (cardImage.getType() == Icon.TYPE_URI) {
+                // Do not allow icon created with content URI.
+                mCardDrawable = null;
+            } else {
+                mCardDrawable =
+                    mWalletCard.getCardImage().loadDrawable(mPluginContext);
+            }
             Icon icon = mWalletCard.getCardIcon();
             mIconDrawable = icon == null ? null : icon.loadDrawable(mPluginContext);
         }