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

Change-Id: I7f8b310b4916880d9329bdb5b55c0d50c1091e77

core/java/android/app/ActivityManager.java

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