Use UserManager.getUserIcon() to get the user's avatar.

Change-Id: I035a5e2a518eb827a2e44910471ed04923921aa3
2012-09-17 10:21:27 -07:00
parent bdb9fc8687
commit e940dac47a
4 changed files with 40 additions and 12 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -418,11 +418,10 @@ public class UserSettings extends SettingsPreferenceFragment
    }

    private void setPhotoId(Preference pref, UserInfo user) {
-        ParcelFileDescriptor fd = mUserManager.setUserIcon(user.id);
-        Drawable d = Drawable.createFromStream(new ParcelFileDescriptor.AutoCloseInputStream(fd),
-                user.iconPath);
-        if (d == null) return;
-        pref.setIcon(d);
+        Drawable icon = UserUtils.getUserIcon(mUserManager, user);
+        if (icon != null) {
+            pref.setIcon(icon);
+        }
    }

    private void setUserName(String name) {