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

Commit b98bcce3 authored by Christopher Tate's avatar Christopher Tate
Browse files

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
parent 33532e02

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 {