summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2020-11-23 13:53:08 -0800
committer Nate Myren <ntmyren@google.com> 2020-11-23 22:31:46 +0000
commitd1dea94ffecbe6ffd2186d15790c116cc1b8704a (patch)
tree65ccc2a83d7709609fe4146486833f5332eb8816
parentd141faef24412468ca3d2805ccb9160a13b50146 (diff)
Add null check to getAppContentDescription
Bug: 173798457 Test: atest LocationPermissionAppsFragmentTest Change-Id: I547222211e99645443354bd262b6833990fc3792
-rw-r--r--packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java3
1 files changed, 3 insertions, 0 deletions
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 6125b8509fcf..5dc0b7274408 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();