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

2016-03-24 22:14:41 +00:00
parent 657c2fa5c6 1ae5a69bc4
commit 3e39f50a3d
1 changed files with 3 additions and 2 deletions
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -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);