Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a818e970 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "Fix #38218977 : NPE restoring widget mappings" into oc-dev am: a8fe2444 

am: 072a9bd3

Change-Id: I4a453961ac6e909b63003ba180e4845cb801d249
parents 2ff4bdc9 072a9bd3

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {