commit 133e292ec532c19e01e8c9af033ad4712c772481
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 08 15:24:11 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 08 15:24:11 2020 +0000
tree 90e2b6cf1e45e3ec7e5dc0e06ee4401c94fc08d3
parent 2f162c37cfddc7e6d462571e349a9e208448988e
parent 3187e48e1fa9448317d69045327d83f6d28cd5be

DO NOT MERGE: Add another exception to the nearby-sharing chip code. am: 3187e48e1f

Change-Id: Id338e3a93630c726dd7c4d68b6c40c7d1a8ef2c3

core/java/com/android/internal/app/ChooserActivity.java

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index e8d232f..0bf2d64 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -956,7 +956,9 @@
                 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());