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

Commit 133e292e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: Id338e3a93630c726dd7c4d68b6c40c7d1a8ef2c3
parents 2f162c37 3187e48e

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

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