Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9595ad65 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

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

parents 01629a21 3187e48e

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

+3 −1
Original line number Diff line number Diff line
@@ -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());