commit 034bcf425a0d8ac9032853b1a929fcb7bdc42229
author Felipe Leme <felipeal@google.com> Mon Aug 08 17:17:52 2016 -0700
committer Felipe Leme <felipeal@google.com> Mon Aug 08 18:07:44 2016 -0700
tree 01e75a6d8190092f038240351d9677ceaa34a847
parent 0c282087e4b9bdb946e8eabad2a00498dca9dfbc

Cancel dialog before stopping service.

Fixes: 30746086

Change-Id: Iea8a197a2785259dd80aa8130d79ded484562826

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

diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index 5d23b07..18c7dbe 100644
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -556,6 +556,7 @@
     private void cancel(int id) {
         MetricsLogger.action(this, MetricsEvent.ACTION_BUGREPORT_NOTIFICATION_ACTION_CANCEL);
         Log.v(TAG, "cancel: ID=" + id);
+        mInfoDialog.cancel();
         final BugreportInfo info = getInfo(id);
         if (info != null && !info.finished) {
             Log.i(TAG, "Cancelling bugreport service (ID=" + id + ") on user's request");
@@ -563,7 +564,6 @@
             deleteScreenshots(info);
         }
         stopProgress(id);
-        mInfoDialog.cancel();
     }
 
     /**