Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index aba2c3d5..2b086a6 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -232,7 +232,8 @@
                 Drawable icon = null;
                 try {
                     if (desc.iconId != 0) {
-                        Context authContext = context.createPackageContext(desc.packageName, 0);
+                        Context authContext = context.createPackageContextAsUser(desc.packageName,
+                                0, userHandle);
                         icon = context.getPackageManager().getUserBadgedIcon(
                                 authContext.getDrawable(desc.iconId), userHandle);
                     }