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

Commit 4cf9c58c authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Skip parceling destroyed buffer" into rvc-dev am: b159f28f 

Change-Id: I7f8b310b4916880d9329bdb5b55c0d50c1091e77
parents cc648665 b159f28f

core/java/android/app/ActivityManager.java

+2 −1
Original line number Diff line number Diff line
@@ -2231,7 +2231,8 @@ public class ActivityManager { 
        public void writeToParcel(Parcel dest, int flags) {

            dest.writeLong(mId);

            ComponentName.writeToParcel(mTopActivityComponent, dest);

            dest.writeParcelable(mSnapshot, 0);

            dest.writeParcelable(mSnapshot != null && !mSnapshot.isDestroyed() ? mSnapshot : null,

                    0);

            dest.writeInt(mColorSpace.getId());

            dest.writeInt(mOrientation);

            dest.writeInt(mRotation);