commit dd0e23382bcfc55c374e0dae2dab234af0d27234
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 08 16:24:28 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 08 16:24:28 2025 -0800
tree 1043679276fd8c3ba3dd33470bee6e9d82b9d72a
parent 41cf4fbaf40f5f90be908f44c8a1519d228125d9
parent 0b0696d57a834fb01f30dbcbb2f257bab42590fa

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30879320'] into 25Q1-release.

Change-Id: Ifc977ae7373b85c2664bbc6879d6b7473b7b953d

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

diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index 0694b61..62f48ea 100644
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -2404,8 +2404,8 @@
             bugreportLocationInfo = new BugreportLocationInfo(readFile(in));
 
             int screenshotSize = in.readInt();
+            screenshotLocationInfo = new ScreenshotLocationInfo(null);
             for (int i = 1; i <= screenshotSize; i++) {
-                screenshotLocationInfo = new ScreenshotLocationInfo(null);
                 screenshotLocationInfo.mScreenshotFiles.add(readFile(in));
             }