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

Merge "Fix potential NPE crash in ConversationHeaderPreferenceController"

Browse Source
This commit is contained in:
Treehugger Robot
2022-09-09 14:20:05 +00:00
committed by Gerrit Code Review
parent 976f702727 78fc8a21a4
commit 4378ee11ad
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 @VisibleForTesting
CharSequence getLabel() { CharSequence getLabel() {
return mConversationInfo != null CharSequence label = null;
? mConversationInfo.getLabel() if (mConversationInfo != null) {
: mChannel.getName(); label = mConversationInfo.getLabel();
} else if (mChannel != null) {
label = mChannel.getName();
}
return label;
} }
} }

4
tests/robotests/src/com/android/settings/notification/app/ConversationHeaderPreferenceControllerTest.java
View File

@@ -20,6 +20,7 @@ import static android.app.NotificationManager.IMPORTANCE_NONE;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -121,6 +122,9 @@ public class ConversationHeaderPreferenceControllerTest {
NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE); NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE);
mController.onResume(appRow, channel, null, null, null, null, null); mController.onResume(appRow, channel, null, null, null, null, null);
assertEquals(channel.getName(), mController.getLabel()); assertEquals(channel.getName(), mController.getLabel());
mController.onResume(appRow, null, null, null, null, null, null);
assertNull(mController.getLabel());
} }
@Test @Test