From 921eb837fc1301edc5e91350a033a1ab6d6bba54 Mon Sep 17 00:00:00 2001 From: Skrilax_CZ Date: Wed, 11 May 2016 22:30:50 -0700 Subject: Check for null provider info when removing widget When doing clean installation and restoring backup, any stubs for the widget on the homescreen for apps are not present (downloading them doesn't help) appear to have null provider info. Add a check for that in removeAppWidget to prevent crashing. Change-Id: I207b6a9ba534f572e1937a7b2a0cdc4eb90aff37 --- src/com/android/launcher3/Launcher.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 8161d38de..4cc7bc4d0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2137,8 +2137,10 @@ public class Launcher extends Activity removeWidgetToAutoAdvance(launcherInfo.hostView); launcherInfo.hostView = null; AppWidgetProviderInfo info = mAppWidgetManager.getAppWidgetInfo(launcherInfo.appWidgetId); - String packageName = info.providerInfo.packageName; - LauncherApplication.getLauncherStats().sendWidgetRemoveEvent(packageName); + if (info != null) { + String packageName = info.providerInfo.packageName; + LauncherApplication.getLauncherStats().sendWidgetRemoveEvent(packageName); + } } public void showOutOfSpaceMessage(boolean isHotseatLayout) { -- cgit v1.2.3