commit 6906c957730f0e0404f1499bac04506c83df8133
author Salvador Martinez <dehboxturtle@google.com> Wed Oct 12 17:22:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 12 17:22:48 2016 +0000
tree 50c85c2ded67528e02fa68732a780333e26bd7e3
parent c747340fa0c25cca2d96d8d684446f46b67209d4
parent 47d00cf15844d7af6788252763b454abc43acab0

Merge "Memory Usage by apps no longer shows empty icon"

src/com/android/settings/applications/ProcStatsPackageEntry.java

diff --git a/src/com/android/settings/applications/ProcStatsPackageEntry.java b/src/com/android/settings/applications/ProcStatsPackageEntry.java
index ef74bc6..dcf87fc 100644
--- a/src/com/android/settings/applications/ProcStatsPackageEntry.java
+++ b/src/com/android/settings/applications/ProcStatsPackageEntry.java
@@ -22,6 +22,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import android.util.Log;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -127,6 +128,7 @@
                 mUiLabel = mUiTargetApp.loadLabel(pm).toString();
             }
         } catch (PackageManager.NameNotFoundException e) {
+            Log.d(TAG, "could not find package: " + mPackage);
         }
     }
 

src/com/android/settings/applications/ProcessStatsPreference.java

diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
index 996ed15..4ee0a04 100644
--- a/src/com/android/settings/applications/ProcessStatsPreference.java
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -22,9 +22,11 @@
 import android.text.TextUtils;
 import android.text.format.Formatter;
 
+import android.util.Log;
 import com.android.settings.AppProgressPreference;
 
 public class ProcessStatsPreference extends AppProgressPreference {
+    static final String TAG = "ProcessStatsPreference";
 
     private ProcStatsPackageEntry mEntry;
 
@@ -35,11 +37,15 @@
     public void init(ProcStatsPackageEntry entry, PackageManager pm, double maxMemory,
             double weightToRam, double totalScale, boolean avg) {
         mEntry = entry;
-        setTitle(TextUtils.isEmpty(entry.mUiLabel) ? entry.mPackage : entry.mUiLabel);
+        String title = TextUtils.isEmpty(entry.mUiLabel) ? entry.mPackage : entry.mUiLabel;
+        setTitle(title);
+        if (TextUtils.isEmpty(title)) {
+            Log.d(TAG, "PackageEntry contained no package name or uiLabel");
+        }
         if (entry.mUiTargetApp != null) {
             setIcon(entry.mUiTargetApp.loadIcon(pm));
         } else {
-            setIcon(new ColorDrawable(0));
+            setIcon(pm.getDefaultActivityIcon());
         }
         boolean statsForeground = entry.mRunWeight > entry.mBgWeight;
         double amount = avg ? (statsForeground ? entry.mRunWeight : entry.mBgWeight) * weightToRam