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

Commit 89439d1c authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Fix NPE 2p: e51c4026 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886855

Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: If4fbb93679e171c01f687d2e4a91ac6aa81a7677
Merged-In: I9c681106f6d645e62b0e44903d40aa523fee0e95
parents 25ab88cc e51c4026

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()));

    }

}