commit 10c3834b4f745c235b8e1a37994b22ccd5bea767
author Jeff Sharkey <jsharkey@android.com> Thu Oct 08 17:29:47 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 08 17:29:47 2009 -0700
tree 22cc01c8e1ac21eee8a746b0791452b9bbaaba66
parent d708e5554cf5945bdbf3a6bc0db1b75502ee3194
parent b7da2d0f30e012f786686bedea065af01f20a4e2

am b7da2d0f: Allow omission of RES_PACKAGE for status attributions.

Merge commit 'b7da2d0f30e012f786686bedea065af01f20a4e2' into eclair-mr2

* commit 'b7da2d0f30e012f786686bedea065af01f20a4e2':
  Allow omission of RES_PACKAGE for status attributions.

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

diff --git a/src/com/android/contacts/util/DataStatus.java b/src/com/android/contacts/util/DataStatus.java
index 9d12894..88c6594 100644
--- a/src/com/android/contacts/util/DataStatus.java
+++ b/src/com/android/contacts/util/DataStatus.java
@@ -98,6 +98,9 @@
     public CharSequence getTimestampLabel(Context context) {
         final PackageManager pm = context.getPackageManager();
 
+        // Use local package for resources when none requested
+        if (mResPackage == null) mResPackage = context.getPackageName();
+
         final boolean validTimestamp = mTimestamp > 0;
         final boolean validLabel = mResPackage != null && mLabelRes != -1;
 
@@ -124,6 +127,10 @@
 
     public Drawable getIcon(Context context) {
         final PackageManager pm = context.getPackageManager();
+
+        // Use local package for resources when none requested
+        if (mResPackage == null) mResPackage = context.getPackageName();
+
         final boolean validIcon = mResPackage != null && mIconRes != -1;
         return validIcon ? pm.getDrawable(mResPackage, mIconRes, null) : null;
     }