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

Commit 11a3aaab authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "NotificationHistory validate position value" into tm-dev am: e73f9cb7... 

Merge "NotificationHistory validate position value" into tm-dev am: e73f9cb7 am: eae23fc7 am: 81fa404f

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



Change-Id: Iad0b2dc54ae6d05b0b2f20b64f8cb253c6469b00
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10202875 81fa404f

core/java/android/app/NotificationHistory.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -256,6 +256,10 @@ public final class NotificationHistory implements Parcelable { 
            mParcel.setDataPosition(0);

            mParcel.setDataPosition(0);

            mParcel.appendFrom(data, data.dataPosition(), listByteLength);

            mParcel.appendFrom(data, data.dataPosition(), listByteLength);

            mParcel.setDataSize(mParcel.dataPosition());

            mParcel.setDataSize(mParcel.dataPosition());

            if (positionInParcel > mParcel.dataSize()) {

                throw new IllegalStateException(

                    "Obtained an invalid position value(" + positionInParcel + " from Parcel.");

            }

            mParcel.setDataPosition(positionInParcel);

            mParcel.setDataPosition(positionInParcel);

        }

        }

    }

    }