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

Commit f949e8ae authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

Merge "Fix missing fields when parceling the BugreportInfo" am: 2042ea04 am:... 

Merge "Fix missing fields when parceling the BugreportInfo" am: 2042ea04 am: 77d51683 am: ffcba920

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa5d63a7d7951bb9fcf337e859df786688ac2c6a
parents 73338733 ffcba920

packages/Shell/src/com/android/shell/BugreportProgressService.java

+8 −2
Original line number Diff line number Diff line
@@ -2148,8 +2148,10 @@ public class BugreportProgressService extends Service { 
            name = in.readString();

            initialName = in.readString();

            title = in.readString();

            shareTitle = in.readString();

            description = in.readString();

            progress.set(in.readInt());

            lastProgress.set(in.readInt());

            lastUpdate.set(in.readLong());

            formattedLastUpdate = in.readString();

            bugreportFile = readFile(in);
@@ -2160,9 +2162,10 @@ public class BugreportProgressService extends Service { 
            }



            finished.set(in.readInt() == 1);

            addingDetailsToZip = in.readBoolean();

            addedDetailsToZip = in.readBoolean();

            screenshotCounter = in.readInt();

            shareDescription = in.readString();

            shareTitle = in.readString();

            type = in.readInt();

        }
@@ -2173,8 +2176,10 @@ public class BugreportProgressService extends Service { 
            dest.writeString(name);

            dest.writeString(initialName);

            dest.writeString(title);

            dest.writeString(shareTitle);

            dest.writeString(description);

            dest.writeInt(progress.intValue());

            dest.writeInt(lastProgress.intValue());

            dest.writeLong(lastUpdate.longValue());

            dest.writeString(getFormattedLastUpdate());

            writeFile(dest, bugreportFile);
@@ -2185,9 +2190,10 @@ public class BugreportProgressService extends Service { 
            }



            dest.writeInt(finished.get() ? 1 : 0);

            dest.writeBoolean(addingDetailsToZip);

            dest.writeBoolean(addedDetailsToZip);

            dest.writeInt(screenshotCounter);

            dest.writeString(shareDescription);

            dest.writeString(shareTitle);

            dest.writeInt(type);

        }