Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6570ee5f authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "Add null check in AppWidgetProvider#loadDescription before calling...

Merge "Add null check in AppWidgetProvider#loadDescription before calling CharSequence#toString()" into sc-dev
parents 52393461 54c9d7e9
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -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;
    }