From 54c9d7e9cbc63b3923800eeff0ae8572213233d7 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 4 May 2021 19:00:30 +0000
Subject: [PATCH] Add null check in AppWidgetProvider#loadDescription before
 calling CharSequence#toString()

Bug: 186789881
Test: Not needed for a null check.
Change-Id: I015ba5943ca3aa218048fe2d11ebd501b5ddab07
---
 .../java/android/appwidget/AppWidgetProviderInfo.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java
index 3db18856d9a70..063ba1174cdc1 100644
--- a/core/java/android/appwidget/AppWidgetProviderInfo.java
+++ b/core/java/android/appwidget/AppWidgetProviderInfo.java
@@ -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;
     }