Merge "Cancel dialog before stopping service."

1 files changed, 1 insertions, 1 deletions

diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index 5d23b07b8e28..18c7dbec9ca3 100644
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -556,6 +556,7 @@ public class BugreportProgressService extends Service {
     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 @@ public class BugreportProgressService extends Service {
             deleteScreenshots(info);
         }
         stopProgress(id);
-        mInfoDialog.cancel();
     }
 
     /**