diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2021-08-16 15:22:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-16 15:22:03 +0000 |
| commit | 73feaa09a645a1176c6619602cf15acbb2ebd90e (patch) | |
| tree | 6706ba069c9a20a2b88e3aef1b751c363fcf6f51 | |
| parent | 557189cf2864dbcfc1d9f13fad1dccb765332d37 (diff) | |
| parent | 1561c6ac277a2246e12a1b19ce2c88d5702cac98 (diff) | |
Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977
Change-Id: I982da8dc1e245e339d3f03c7c084f88f8ad1b61d
| -rw-r--r-- | services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index a56b1db1494c..c32543ae5c13 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 @@ 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. |