From 07d6fd2c0111c64d4a6721fd2a5a1fbe5102ff0b Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 15 Jul 2011 18:37:16 -0700 Subject: [PATCH] Fix NPE in MasterClear Bug: 5008299 Change-Id: If2d02af7ecda7fe40445a3ec8e023138c5523fd6 --- src/com/android/settings/MasterClear.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 1b045eae3a7..29a92b106b8 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -196,13 +196,14 @@ public class MasterClear extends Fragment { + " type=" + account.type); continue; } - Drawable icon; + Drawable icon = null; try { - Context authContext = context.createPackageContext(desc.packageName, 0); - icon = authContext.getResources().getDrawable(desc.iconId); + if (desc.iconId != 0) { + Context authContext = context.createPackageContext(desc.packageName, 0); + icon = authContext.getResources().getDrawable(desc.iconId); + } } catch (PackageManager.NameNotFoundException e) { Log.w(TAG, "No icon for account type " + desc.type); - icon = null; } TextView child = (TextView)inflater.inflate(R.layout.master_clear_account,