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

Commit 3187e48e authored by Dan Sandler's avatar Dan Sandler Committed by Daniel Sandler
Browse files

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

Fixes: 146690046
Test: Share from Chrome
Change-Id: I41b3965ca2289f628a2d1de3a6da7daf01385a54
parent fc94ebae

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -952,7 +952,9 @@ public class ChooserActivity extends ResolverActivity { 
                name = pkgRes.getString(nameResId);

                name = pkgRes.getString(nameResId);

                final int resId = metaData.getInt(CHIP_ICON_METADATA_KEY);

                final int resId = metaData.getInt(CHIP_ICON_METADATA_KEY);

                icon = pkgRes.getDrawable(resId);

                icon = pkgRes.getDrawable(resId);

            } catch (NameNotFoundException ex) { }

            } catch (Resources.NotFoundException ex) {

            } catch (NameNotFoundException ex) {

            }

        }

        }

        if (TextUtils.isEmpty(name)) {

        if (TextUtils.isEmpty(name)) {

            name = ri.loadLabel(getPackageManager());

            name = ri.loadLabel(getPackageManager());