Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check to getAppContentDescription" into mainline-prod

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-24 00:52:11 +00:00
committed by Android (Google) Code Review
parent 73e672535c d1dea94ffe
commit 227a23a81d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java
View File

@@ -52,6 +52,9 @@ public class AppUtils {
public static String getAppContentDescription(Context context, String packageName, public static String getAppContentDescription(Context context, String packageName,
int userId) { int userId) {
final CharSequence appLabel = getApplicationLabel(context.getPackageManager(), packageName); final CharSequence appLabel = getApplicationLabel(context.getPackageManager(), packageName);
if (appLabel == null) {
return "";
}
return context.getSystemService(UserManager.class).isManagedProfile(userId) return context.getSystemService(UserManager.class).isManagedProfile(userId)
? context.getString(R.string.accessibility_work_profile_app_description, appLabel) ? context.getString(R.string.accessibility_work_profile_app_description, appLabel)
: appLabel.toString(); : appLabel.toString();