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

Merge "Proper handle of duplicated BUGREPORT_STARTED." into nyc-dev

Browse Source 
am: 3e39f50

* commit '3e39f50a3d384480a8892aeba782d06fcfebc867':
  Proper handle of duplicated BUGREPORT_STARTED.
This commit is contained in:
Felipe Leme
2016-03-24 22:55:23 +00:00
committed by android-build-merger
parent 8127d6f04f 3e39f50a3d
commit 9b64d2eb10
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,10 +409,11 @@ public class BugreportProgressService extends Service {
final BugreportInfo info = new BugreportInfo(mContext, id, pid, name, max);
if (mProcesses.indexOfKey(id) >= 0) {
// BUGREPORT_STARTED intent was already received; ignore it.
Log.w(TAG, "ID " + id + " already watched");
} else {
mProcesses.put(info.id, info);
return true;
}
mProcesses.put(info.id, info);
// Take initial screenshot.
takeScreenshot(id, false);
updateProgress(info);