Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing fields when parceling the BugreportInfo" am: 2042ea04aa am: 77d5168388

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I761e172a053d380ab68728236a2871af4e1876fe
This commit is contained in:
Rhed Jao
2021-01-07 13:17:00 +00:00
committed by Automerger Merge Worker
parent 276ffb6422 77d5168388
commit ffcba92063
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -2146,8 +2146,10 @@ public class BugreportProgressService extends Service {
name = in.readString(); name = in.readString();
initialName = in.readString(); initialName = in.readString();
title = in.readString(); title = in.readString();
shareTitle = in.readString();
description = in.readString(); description = in.readString();
progress.set(in.readInt()); progress.set(in.readInt());
lastProgress.set(in.readInt());
lastUpdate.set(in.readLong()); lastUpdate.set(in.readLong());
formattedLastUpdate = in.readString(); formattedLastUpdate = in.readString();
bugreportFile = readFile(in); bugreportFile = readFile(in);
@@ -2158,9 +2160,10 @@ public class BugreportProgressService extends Service {
} }
finished.set(in.readInt() == 1); finished.set(in.readInt() == 1);
addingDetailsToZip = in.readBoolean();
addedDetailsToZip = in.readBoolean();
screenshotCounter = in.readInt(); screenshotCounter = in.readInt();
shareDescription = in.readString(); shareDescription = in.readString();
shareTitle = in.readString();
type = in.readInt(); type = in.readInt();
} }
@@ -2171,8 +2174,10 @@ public class BugreportProgressService extends Service {
dest.writeString(name); dest.writeString(name);
dest.writeString(initialName); dest.writeString(initialName);
dest.writeString(title); dest.writeString(title);
dest.writeString(shareTitle);
dest.writeString(description); dest.writeString(description);
dest.writeInt(progress.intValue()); dest.writeInt(progress.intValue());
dest.writeInt(lastProgress.intValue());
dest.writeLong(lastUpdate.longValue()); dest.writeLong(lastUpdate.longValue());
dest.writeString(getFormattedLastUpdate()); dest.writeString(getFormattedLastUpdate());
writeFile(dest, bugreportFile); writeFile(dest, bugreportFile);
@@ -2183,9 +2188,10 @@ public class BugreportProgressService extends Service {
} }
dest.writeInt(finished.get() ? 1 : 0); dest.writeInt(finished.get() ? 1 : 0);
dest.writeBoolean(addingDetailsToZip);
dest.writeBoolean(addedDetailsToZip);
dest.writeInt(screenshotCounter); dest.writeInt(screenshotCounter);
dest.writeString(shareDescription); dest.writeString(shareDescription);
dest.writeString(shareTitle);
dest.writeInt(type); dest.writeInt(type);
} }