diff options
| author | Daniel Sandler <dsandler@android.com> | 2020-01-08 15:10:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-08 15:10:35 +0000 |
| commit | 9595ad654b547711c1af56a562dbf429e608d176 (patch) | |
| tree | 1465350b20d835b6de5f9ce66f054e77b18a7930 | |
| parent | 01629a21a65593eb14b280a0f6ba412c2dfb6627 (diff) | |
| parent | 3187e48e1fa9448317d69045327d83f6d28cd5be (diff) | |
| download | base-9595ad654b547711c1af56a562dbf429e608d176.tar.gz | |
Merge "DO NOT MERGE: Add another exception to the nearby-sharing chip code." into qt-qpr1-dev
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index d34174c64977..ef51c0d7df7e 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()); |