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

Commit 034bcf42 authored by Felipe Leme's avatar Felipe Leme
Browse files

Cancel dialog before stopping service. 

Fixes: 30746086

Change-Id: Iea8a197a2785259dd80aa8130d79ded484562826
parent 0c282087

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

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

    }



    /**