From b98bcce37cfeab47bdf3394c6e0a193eb53f5b48 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Thu, 11 May 2017 15:39:34 -0700 Subject: Fix #38218977 : NPE restoring widget mappings Remember that we might not be able to resolve historical widget provider references, so don't access them unchecked. Test: manual Change-Id: I01c6c68461b6d15aa8fee402a4bfb0f21bf1ddbb --- .../java/com/android/server/appwidget/AppWidgetServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services/appwidget/java') diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index b2712ff140ee..aad44314e6cb 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -4365,7 +4365,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } addWidgetLocked(id); } - if (id.provider.info != null) { + if (id.provider != null && id.provider.info != null) { stashProviderRestoreUpdateLocked(id.provider, restoredId, id.appWidgetId); } else { -- cgit v1.2.3-59-g8ed1b