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

Commit f8f80c80 authored by Ben Kwa's avatar Ben Kwa Committed by Android (Google) Code Review
Browse files

Merge "Fix cancellation of copy jobs."

parents 3f2631f5 94ac0d7d

packages/DocumentsUI/src/com/android/documentsui/CopyService.java

+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ public class CopyService extends IntentService { 
        cancelIntent.putExtra(EXTRA_CANCEL, mJobId);

        mProgressBuilder.addAction(R.drawable.ic_cab_cancel,

                getString(android.R.string.cancel), PendingIntent.getService(this, 0,

                        cancelIntent, PendingIntent.FLAG_ONE_SHOT));

                        cancelIntent,

                        PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT));



        // Send an initial progress notification.

        mProgressBuilder.setProgress(0, 0, true); // Indeterminate progress while setting up.