commit d9f11ebbcf22b2e8f423f0887826c03d01d4a509
author Makoto Onuki <omakoto@google.com> Wed Aug 17 15:04:37 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 17 15:04:37 2011 -0700
tree 38340068c4e2ba1a976704283448cd28429f9e80
parent 1cb1270762bc03f77434a7e56fde520811cc7412
parent 5b8835d19834e3d6e3567769b270a75f17f34507

Merge "Fix bug: Google Talk update title not found anymore"

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

diff --git a/src/com/android/contacts/util/ContactBadgeUtil.java b/src/com/android/contacts/util/ContactBadgeUtil.java
index 806264d..a89177a 100644
--- a/src/com/android/contacts/util/ContactBadgeUtil.java
+++ b/src/com/android/contacts/util/ContactBadgeUtil.java
@@ -57,10 +57,15 @@
 
         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 @@
 
             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);