| commit | 78a05586633bfec3117043d63b7b052eee3a4076 | [log] [tgz] |
|---|---|---|
| author | Ryan Mitchell <rtmitchell@google.com> | Mon Aug 16 15:42:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 16 15:42:00 2021 +0000 |
| tree | dcb39e4c13e389afa078b226cdf0a53dfe19f454 | |
| parent | 9c06ec645a45e092c1cbbcd0bcb48f485626d8bd [diff] | |
| parent | 9fd3a5cc5e6f7140e303744c34cab538cd67fda9 [diff] |
Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 am: 9fd3a5cc5e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977 Change-Id: I1be94b0d2a518231e979ef3a056865d12a2bd86d
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index a56b1db..c32543a 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -3306,11 +3306,12 @@ 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.