Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d3e2d3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am:... 

Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11 am: 1f9c4c48 am: 693ce48e am: 2d1b325c

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



Change-Id: I8fc0d30dd8338152ce2e9c7dc7741b9543f6dcf3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 727d0996 2d1b325c

src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java

+7 −3
Original line number Diff line number Diff line
@@ -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;

    }

}

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

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.app.NotificationManager.IMPORTANCE_NONE; 


import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.mock;
@@ -121,6 +122,9 @@ public class ConversationHeaderPreferenceControllerTest { 
        NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE);

        mController.onResume(appRow, channel, null, null, null, null, null);

        assertEquals(channel.getName(), mController.getLabel());



        mController.onResume(appRow, null, null, null, null, null, null);

        assertNull(mController.getLabel());

    }



    @Test