From d1dea94ffecbe6ffd2186d15790c116cc1b8704a Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com>
Date: Mon, 23 Nov 2020 13:53:08 -0800
Subject: [PATCH] Add null check to getAppContentDescription

Bug: 173798457
Test: atest LocationPermissionAppsFragmentTest
Change-Id: I547222211e99645443354bd262b6833990fc3792
---
 .../com/android/settingslib/utils/applications/AppUtils.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java
index 6125b8509fcfb..5dc0b7274408c 100644
--- a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java
+++ b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java
@@ -52,6 +52,9 @@ public class AppUtils {
     public static String getAppContentDescription(Context context, String packageName,
             int userId) {
         final CharSequence appLabel = getApplicationLabel(context.getPackageManager(), packageName);
+        if (appLabel == null) {
+            return "";
+        }
         return context.getSystemService(UserManager.class).isManagedProfile(userId)
                 ? context.getString(R.string.accessibility_work_profile_app_description, appLabel)
                 : appLabel.toString();