diff options
| author | Ben Kwa <kenobi@google.com> | 2015-04-16 16:45:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 16:45:29 +0000 |
| commit | f8f80c8034b3f2dab3f8edbf78196efc51aa8a1a (patch) | |
| tree | 8630dc1236d6e158794ad009aae99cb9030165ca /packages/DocumentsUI | |
| parent | 3f2631f526d0a0ac0b57ac9f6d241bcc7aeb5f5b (diff) | |
| parent | 94ac0d7d3069adc5074945cec3d7d5f5a64b4e7a (diff) | |
| download | frameworks_base-f8f80c8034b3f2dab3f8edbf78196efc51aa8a1a.zip frameworks_base-f8f80c8034b3f2dab3f8edbf78196efc51aa8a1a.tar.gz frameworks_base-f8f80c8034b3f2dab3f8edbf78196efc51aa8a1a.tar.bz2 | |
Merge "Fix cancellation of copy jobs."
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/CopyService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java index d2ef3d7..a9f03b6 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java +++ b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java @@ -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. |