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

Commit e07e667d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-mainline-prod 

* changes:
  [automerge] Fix NPE 2p: e51c4026
  Fix NPE
parents 6342dac5 1d064e8c

core/java/android/app/NotificationChannelGroup.java

+11 −3
Original line number Diff line number Diff line
@@ -95,8 +95,11 @@ public final class NotificationChannelGroup implements Parcelable { 
        } else {

            mId = null;

        }

        mName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);

        mName = getTrimmedString(mName.toString());

        if (in.readByte() != 0) {

            mName = getTrimmedString(in.readString());

        } else {

            mName = "";

        }

        if (in.readByte() != 0) {

            mDescription = getTrimmedString(in.readString());

        } else {
@@ -122,7 +125,12 @@ public final class NotificationChannelGroup implements Parcelable { 
        } else {

            dest.writeByte((byte) 0);

        }

        TextUtils.writeToParcel(mName.toString(), dest, flags);

        if (mName != null) {

            dest.writeByte((byte) 1);

            dest.writeString(mName.toString());

        } else {

            dest.writeByte((byte) 0);

        }

        if (mDescription != null) {

            dest.writeByte((byte) 1);

            dest.writeString(mDescription);

core/tests/coretests/src/android/app/NotificationChannelGroupTest.java

+16 −0
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@ 
package android.app;



import static junit.framework.TestCase.assertEquals;

import static junit.framework.TestCase.assertTrue;



import android.os.Parcel;

import android.test.AndroidTestCase;

import android.text.TextUtils;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -70,4 +72,18 @@ public class NotificationChannelGroupTest { 
        assertEquals(NotificationChannelGroup.MAX_TEXT_LENGTH,

                fromParcel.getDescription().length());

    }



    @Test

    public void testNullableFields() {

        NotificationChannelGroup group = new NotificationChannelGroup("my_group_01", null);



        Parcel parcel = Parcel.obtain();

        group.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);



        NotificationChannelGroup fromParcel =

                NotificationChannelGroup.CREATOR.createFromParcel(parcel);

        assertEquals(group.getId(), fromParcel.getId());

        assertTrue(TextUtils.isEmpty(fromParcel.getName()));

    }

}