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

Commit 5b8835d1 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Fix bug: Google Talk update title not found anymore 

When the resource package is not set, we use the framework resources,
so we need to pass "android" to getIdentifier() as a package name.

Bug 5163188

Change-Id: If5b57feb7419909279b58eb51644ff31e2d25478
parent a248f3c1

src/com/android/contacts/util/ContactBadgeUtil.java

+6 −1
Original line number Diff line number Diff line
@@ -57,10 +57,15 @@ public class ContactBadgeUtil { 


        final String statusLabelRes = streamItem.getLabelRes();

        final String statusResPackage = streamItem.getResPackage();



        // Package name used for resources.getIdentifier()

        String identiferPackage = statusResPackage;

        if (statusLabelRes  != null) {

            Resources resources;

            if (TextUtils.isEmpty(statusResPackage)) {

                resources = context.getResources();

                // In this case, we're using the framework resources.

                identiferPackage = "android";

            } else {

                PackageManager pm = context.getPackageManager();

                try {
@@ -74,7 +79,7 @@ public class ContactBadgeUtil { 


            if (resources != null) {

                final int resId = resources.getIdentifier(statusLabelRes, "string",

                        statusResPackage);

                        identiferPackage);

                if (resId == 0) {

                    Log.w(TAG, "Contact status update resource not found: " + statusLabelRes +

                            " in " + statusResPackage);