Snap for 10447354 from 6bd66c73aeb2249c21f38f35e37e430b897480e0 to mainline-tethering-releaseaml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_tet_341112070aml_tet_341010040aml_tet_340913030android14-mainline-tethering-release

Change-Id: Ic8f10af3a493f7b3d4cd57a93789309320f26f35

7 files changed, 16 insertions, 8 deletions

diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 6082758..1adf6f3 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="error_user_locked" msgid="3088770324409338404">"Unlock your phone to load your payment info"</string>
     <string name="accessibility_menu" msgid="1982506521504867550">"Menu"</string>
-    <string name="error_generic" msgid="5736597066829262527">"There was a problem getting your cards. Please try again later."</string>
+    <string name="error_generic" msgid="5736597066829262527">"There was a problem getting your cards, please try again later"</string>
     <string name="settings" msgid="4740257901811398113">"Settings"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5a0e9c6..6529c43 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="error_user_locked" msgid="3088770324409338404">"Buka kunci ponsel untuk memuat info pembayaran Anda"</string>
     <string name="accessibility_menu" msgid="1982506521504867550">"Menu"</string>
-    <string name="error_generic" msgid="5736597066829262527">"Terjadi masalah saat mendapatkan kartu Anda, harap coba lagi nanti"</string>
+    <string name="error_generic" msgid="5736597066829262527">"Terjadi error saat mendapatkan kartu Anda, harap coba lagi nanti"</string>
     <string name="settings" msgid="4740257901811398113">"Setelan"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 2cd25c9..b87f9da 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -4,5 +4,5 @@
     <string name="error_user_locked" msgid="3088770324409338404">"Төлөм маалыматыңызды жүктөө үчүн телефонуңуздун кулпусун ачыңыз"</string>
     <string name="accessibility_menu" msgid="1982506521504867550">"Меню"</string>
     <string name="error_generic" msgid="5736597066829262527">"Кыйытмаларды алууда ката кетти. Бир аздан кийин кайталап көрүңүз."</string>
-    <string name="settings" msgid="4740257901811398113">"Жөндөөлөр"</string>
+    <string name="settings" msgid="4740257901811398113">"Параметрлер"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a8f430c..877cd76 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="error_user_locked" msgid="3088770324409338404">"Lås opp telefonen for å laste inn betalingsopplysninger"</string>
     <string name="accessibility_menu" msgid="1982506521504867550">"Meny"</string>
-    <string name="error_generic" msgid="5736597066829262527">"Det oppsto et problem med henting av kortene dine. Prøv igjen senere"</string>
+    <string name="error_generic" msgid="5736597066829262527">"Det oppsto et problem med henting av kortene dine. Prøv på nytt senere"</string>
     <string name="settings" msgid="4740257901811398113">"Innstillinger"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6007efb..74f9ae6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="error_user_locked" msgid="3088770324409338404">"Desbloqueie o telemóvel para carregar as informações de pagamento."</string>
     <string name="accessibility_menu" msgid="1982506521504867550">"Menu"</string>
-    <string name="error_generic" msgid="5736597066829262527">"Ocorreu um problema ao obter os seus cartões. Tente novamente mais tarde."</string>
+    <string name="error_generic" msgid="5736597066829262527">"Ocorreu um problema ao obter os seus cartões. Tente mais tarde."</string>
     <string name="settings" msgid="4740257901811398113">"Definições"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 72b20f8..8a02a42 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="error_user_locked" msgid="3088770324409338404">"Deblocați telefonul și încărcați informațiile de plată"</string>
+    <string name="error_user_locked" msgid="3088770324409338404">"Deblochează telefonul și încarcă informațiile de plată"</string>
     <string name="accessibility_menu" msgid="1982506521504867550">"Meniu"</string>
-    <string name="error_generic" msgid="5736597066829262527">"A apărut o problemă la preluarea cardurilor. Încercați din nou mai târziu"</string>
+    <string name="error_generic" msgid="5736597066829262527">"A apărut o problemă la preluarea cardurilor. Încearcă din nou mai târziu."</string>
     <string name="settings" msgid="4740257901811398113">"Setări"</string>
 </resources>
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);
         }