Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I982da8dc1e245e339d3f03c7c084f88f8ad1b61d
This commit is contained in:
Ryan Mitchell
2021-08-16 15:22:03 +00:00
committed by Automerger Merge Worker
parent 557189cf28 1561c6ac27
commit 73feaa09a6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -3306,11 +3306,12 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
Slog.w(TAG, "Failed to retrieve app info for " + packageName Slog.w(TAG, "Failed to retrieve app info for " + packageName
+ " userId=" + userId, e); + " userId=" + userId, e);
} }
if (newAppInfo == null) { if (newAppInfo == null || provider.info == null
|| provider.info.providerInfo == null) {
continue; continue;
} }
ApplicationInfo oldAppInfo = provider.info.providerInfo.applicationInfo; 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. // Overlay paths are generated against a particular version of an application.
// The overlays paths of a newly upgraded application are incompatible with the // The overlays paths of a newly upgraded application are incompatible with the
// old version of the application. // old version of the application.