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

Commit 8b33b61f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Read screenshot file from screenshotFiles array"

parents 2b8fb44c 5735c6a2

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -476,10 +476,10 @@ public class BugreportProgressService extends Service { 
    }

    }





    private static void addScreenshotToIntent(Intent intent, BugreportInfo info) {

    private static void addScreenshotToIntent(Intent intent, BugreportInfo info) {

        final String screenshotFileName = info.name + ".png";

        final File screenshotFile = info.screenshotFiles.isEmpty()

        final File screenshotFile = new File(BUGREPORT_DIR, screenshotFileName);

                ? null : info.screenshotFiles.get(0);

        if (screenshotFile != null && screenshotFile.length() > 0) {

            final String screenshotFilePath = screenshotFile.getAbsolutePath();

            final String screenshotFilePath = screenshotFile.getAbsolutePath();

        if (screenshotFile.length() > 0) {

            intent.putExtra(EXTRA_SCREENSHOT, screenshotFilePath);

            intent.putExtra(EXTRA_SCREENSHOT, screenshotFilePath);

        }

        }

        return;

        return;