Merge "DO NOT MERGE: Add another exception to the nearby-sharing chip code." into qt-qpr1-dev

2020-01-08 15:10:35 +00:00
parent 01629a21a6 3187e48e1f
commit 9595ad654b
1 changed files with 3 additions and 1 deletions
--- 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());