am 9b1ac239: am 84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev

* commit '9b1ac239cdad62de8dab458cec40eb752593dc9b':
  Show account icons for managed profiles on Settings > Factory Reset
This commit is contained in:
Zoltan Szatmary-Ban
2014-12-03 20:42:04 +00:00
committed by Android Git Automerger

View File

@@ -232,7 +232,8 @@ public class MasterClear extends Fragment {
Drawable icon = null; Drawable icon = null;
try { try {
if (desc.iconId != 0) { if (desc.iconId != 0) {
Context authContext = context.createPackageContext(desc.packageName, 0); Context authContext = context.createPackageContextAsUser(desc.packageName,
0, userHandle);
icon = context.getPackageManager().getUserBadgedIcon( icon = context.getPackageManager().getUserBadgedIcon(
authContext.getDrawable(desc.iconId), userHandle); authContext.getDrawable(desc.iconId), userHandle);
} }