diff options
| author | Nate Myren <ntmyren@google.com> | 2020-11-23 13:53:08 -0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-11-24 20:19:20 +0000 |
| commit | d0f5739e169030fc98bea1ce6a4155e0f5196fc3 (patch) | |
| tree | 820b41e9023f3435cb01fca4b883e053087dd060 | |
| parent | 568bc5c333f864d2e3cd0ec9e773b939a07b3912 (diff) | |
| download | base-d0f5739e169030fc98bea1ce6a4155e0f5196fc3.tar.gz | |
Add null check to getAppContentDescription
Bug: 173798457
Test: atest LocationPermissionAppsFragmentTest
Change-Id: I547222211e99645443354bd262b6833990fc3792
(cherry picked from commit d1dea94ffecbe6ffd2186d15790c116cc1b8704a)
| -rw-r--r-- | packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java | 3 |
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(); |