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

Commit 9b64d2eb authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

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

am: 3e39f50a

* commit '3e39f50a':
  Proper handle of duplicated BUGREPORT_STARTED.
parents 8127d6f0 3e39f50a

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

+3 −2
Original line number Diff line number Diff line
@@ -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);