diff options
| author | Christopher Tate <ctate@google.com> | 2017-05-11 15:39:34 -0700 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2017-05-11 15:39:34 -0700 |
| commit | b98bcce37cfeab47bdf3394c6e0a193eb53f5b48 (patch) | |
| tree | 35d09078e7b1491f9d373afcc84896b01111e689 /services/appwidget | |
| parent | 33532e020873e580c421342e38b2352b836d30d4 (diff) | |
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
Diffstat (limited to 'services/appwidget')
| -rw-r--r-- | services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |