From 3187e48e1fa9448317d69045327d83f6d28cd5be Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 7 Jan 2020 10:44:43 -0500
Subject: [PATCH] DO NOT MERGE: Add another exception to the nearby-sharing
 chip code.

Fixes: 146690046
Test: Share from Chrome
Change-Id: I41b3965ca2289f628a2d1de3a6da7daf01385a54
---
 core/java/com/android/internal/app/ChooserActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index d34174c64977a..ef51c0d7df7e5 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -952,7 +952,9 @@ public class ChooserActivity extends ResolverActivity {
                 name = pkgRes.getString(nameResId);
                 final int resId = metaData.getInt(CHIP_ICON_METADATA_KEY);
                 icon = pkgRes.getDrawable(resId);
-            } catch (NameNotFoundException ex) { }
+            } catch (Resources.NotFoundException ex) {
+            } catch (NameNotFoundException ex) {
+            }
         }
         if (TextUtils.isEmpty(name)) {
             name = ri.loadLabel(getPackageManager());