From 8882ccdd3eafc338213b312f1b73fb4de1776a60 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 19 Sep 2012 11:15:45 -0700
Subject: [PATCH] Load user photos through system_server.

Bug: 7194137
Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829
---
 src/com/android/settings/fuelgauge/PowerUsageSummary.java | 5 +----
 src/com/android/settings/net/UidDetailProvider.java       | 3 ++-
 src/com/android/settings/users/UserUtils.java             | 7 +++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 9bd553856c..5704163cc6 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -767,10 +767,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
             final int userId = mUserSippers.keyAt(i);
             final List<BatterySipper> sippers = mUserSippers.valueAt(i);
             UserInfo info = mUm.getUserInfo(userId);
-            Drawable icon = null;
-            if (info != null && info.iconPath != null) {
-                icon = UserUtils.getUserIcon(mUm, info);
-            }
+            Drawable icon = UserUtils.getUserIcon(mUm, info, getResources());
             String name = info != null ? info.name : null;
             if (name == null) {
                 name = Integer.toString(info.id);
diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index 37b99ddf17..c631695bdb 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java
@@ -32,6 +32,7 @@ import android.util.SparseArray;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.users.UserUtils;
 
 /**
  * Return details about a specific UID, handling special cases like
@@ -118,7 +119,7 @@ public class UidDetailProvider {
             final UserInfo info = um.getUserInfo(userHandle);
             if (info != null) {
                 detail.label = res.getString(R.string.running_process_item_user_label, info.name);
-                detail.icon = Drawable.createFromPath(info.iconPath);
+                detail.icon = UserUtils.getUserIcon(um, info, res);
                 return detail;
             }
         }
diff --git a/src/com/android/settings/users/UserUtils.java b/src/com/android/settings/users/UserUtils.java
index 433cbd3a16..1d16bcf6c9 100644
--- a/src/com/android/settings/users/UserUtils.java
+++ b/src/com/android/settings/users/UserUtils.java
@@ -17,18 +17,17 @@
 package com.android.settings.users;
 
 import android.content.pm.UserInfo;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.ParcelFileDescriptor;
 import android.os.UserManager;
 
 public class UserUtils {
-
-    public static Drawable getUserIcon(UserManager um, UserInfo user) {
+    public static Drawable getUserIcon(UserManager um, UserInfo user, Resources res) {
         if (user.iconPath == null) return null;
         Bitmap icon = um.getUserIcon(user.id);
         if (icon == null) return null;
-        return new BitmapDrawable(icon);
+        return new BitmapDrawable(res, icon);
     }
 }
-- 
2.11.0