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

Commit 6634c370 authored by Alina Zaidi's avatar Alina Zaidi Committed by Automerger Merge Worker
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 am: 6570ee5f

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

Change-Id: Ia2a776fb6079e0f75327271126ac6e8fedcce80e
parents a8dd1d92 6570ee5f

core/java/android/appwidget/AppWidgetProviderInfo.java

+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;

    }