diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index a0972498ab2a6..665bde3415158 100644
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -476,10 +476,10 @@ public class BugreportProgressService extends Service {
     }
 
     private static void addScreenshotToIntent(Intent intent, BugreportInfo info) {
-        final String screenshotFileName = info.name + ".png";
-        final File screenshotFile = new File(BUGREPORT_DIR, screenshotFileName);
-        final String screenshotFilePath = screenshotFile.getAbsolutePath();
-        if (screenshotFile.length() > 0) {
+        final File screenshotFile = info.screenshotFiles.isEmpty()
+                ? null : info.screenshotFiles.get(0);
+        if (screenshotFile != null && screenshotFile.length() > 0) {
+            final String screenshotFilePath = screenshotFile.getAbsolutePath();
             intent.putExtra(EXTRA_SCREENSHOT, screenshotFilePath);
         }
         return;