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

Merge "Add null check in AppWidgetProvider#loadDescription before calling CharSequence#toString()" into sc-dev am: 6570ee5f7b

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

Change-Id: I6fb4a6cd5d72b71956750c9372ab6a911cf07dcc
This commit is contained in:
Alina Zaidi
2021-05-06 15:30:17 +00:00
committed by Automerger Merge Worker
parent 4f4fc784ed 6570ee5f7b
commit 4352b8aec9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/appwidget/AppWidgetProviderInfo.java
View File

@@ -455,13 +455,14 @@ public class AppWidgetProviderInfo implements Parcelable {
@Nullable
public final CharSequence loadDescription(@NonNull Context context) {
if (ResourceId.isValid(descriptionRes)) {
return context.getPackageManager()
.getText(
CharSequence description =
context.getPackageManager().getText(
providerInfo.packageName,
descriptionRes,
providerInfo.applicationInfo)
.toString()
.trim();
providerInfo.applicationInfo);
if (description != null) {
return description.toString().trim();
}
}
return null;
}