From b7da2d0f30e012f786686bedea065af01f20a4e2 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 8 Oct 2009 10:22:30 -0700 Subject: [PATCH] Allow omission of RES_PACKAGE for status attributions. FastTrack was being overly cautious about attribution labels coming from third-party sources. When no RES_PACKAGE is defined, we now fall back to using the local package instead of completely dropping the attribution line. Fixes http://b/2175531 --- src/com/android/contacts/util/DataStatus.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 class DataStatus { 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 class DataStatus { 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; } -- 2.11.0