PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I2b246b643ff341ff8a2158cbabd3f4a33c04703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-09 15:18:57 +00:00
committed by Automerger Merge Worker
parent 4ad699717a 1f9c4c483a
commit 693ce48efb
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
View File

@@ -126,8 +126,12 @@ public class ConversationHeaderPreferenceController extends NotificationPreferen
@VisibleForTesting
CharSequence getLabel() {
return mConversationInfo != null
? mConversationInfo.getLabel()
: mChannel.getName();
CharSequence label = null;
if (mConversationInfo != null) {
label = mConversationInfo.getLabel();
} else if (mChannel != null) {
label = mChannel.getName();
}
return label;
}
}