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

Merge "Read screenshot file from screenshotFiles array"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-11 09:53:24 +00:00
committed by Android (Google) Code Review
parent 2b8fb44cd9 5735c6a247
commit 8b33b61fb1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;