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

Commit cbc4e894 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Automerger Merge Worker
Browse files

Merge "Guard against null info when applying widget RROs" into sc-dev am:... 

Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac am: 73feaa09 am: ed2824c9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977

Change-Id: Ib4fb2365b314e087e59c8d9245fe79d92109e45e
parents 71df45b8 ed2824c9

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

+3 −2
Original line number Diff line number Diff line
@@ -3306,11 +3306,12 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                Slog.w(TAG, "Failed to retrieve app info for " + packageName

                        + " userId=" + userId, e);

            }

            if (newAppInfo == null) {

            if (newAppInfo == null || provider.info == null

                    || provider.info.providerInfo == null) {

                continue;

            }

            ApplicationInfo oldAppInfo = provider.info.providerInfo.applicationInfo;

            if (!newAppInfo.sourceDir.equals(oldAppInfo.sourceDir)) {

            if (oldAppInfo == null || !newAppInfo.sourceDir.equals(oldAppInfo.sourceDir)) {

                // Overlay paths are generated against a particular version of an application.

                // The overlays paths of a newly upgraded application are incompatible with the

                // old version of the application.