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

Browse Source
This commit is contained in:
Alina Zaidi
2021-05-06 15:11:41 +00:00
committed by Android (Google) Code Review
parent 5239346126 54c9d7e9cb
commit 6570ee5f7b
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 @Nullable
public final CharSequence loadDescription(@NonNull Context context) { public final CharSequence loadDescription(@NonNull Context context) {
if (ResourceId.isValid(descriptionRes)) { if (ResourceId.isValid(descriptionRes)) {
return context.getPackageManager() CharSequence description =
.getText( context.getPackageManager().getText(
providerInfo.packageName, providerInfo.packageName,
descriptionRes, descriptionRes,
providerInfo.applicationInfo) providerInfo.applicationInfo);
.toString() if (description != null) {
.trim(); return description.toString().trim();
}
} }
return null; return null;
} }