summaryrefslogtreecommitdiffstats
path: root/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
diff options
context:
space:
mode:
authorSteve McKay <smckay@google.com>2015-05-07 14:08:20 -0700
committerSteve McKay <smckay@google.com>2015-05-11 16:19:00 +0000
commit6e02dc8cd69720043bd36ae29fe93e767e3b38a9 (patch)
tree62e134a63fdb894afaffb62bd7efe49784a45c33 /packages/DocumentsUI/src/com/android/documentsui/CopyService.java
parent7b753cf12e471e15a4b1c1b710393b40502a8bb7 (diff)
downloadframeworks_base-6e02dc8cd69720043bd36ae29fe93e767e3b38a9.zip
frameworks_base-6e02dc8cd69720043bd36ae29fe93e767e3b38a9.tar.gz
frameworks_base-6e02dc8cd69720043bd36ae29fe93e767e3b38a9.tar.bz2
Delete StandaloneActivity from M (DO NOT MERGE)
The activity is already disabled by default. Fix an issue where copy support error handling was attempting to invoke StandaloneActivity. Change-Id: If15c312a183cae1b2a84517e7f7b3123c11bd619
Diffstat (limited to 'packages/DocumentsUI/src/com/android/documentsui/CopyService.java')
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/CopyService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
index 202402f..6e050c6 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
@@ -156,7 +156,7 @@ public class CopyService extends IntentService {
if (mFailedFiles.size() > 0) {
final Context context = getApplicationContext();
- final Intent navigateIntent = new Intent(context, StandaloneActivity.class);
+ final Intent navigateIntent = new Intent(context, DocumentsActivity.class);
navigateIntent.putExtra(EXTRA_STACK, (Parcelable) stack);
navigateIntent.putExtra(EXTRA_FAILURE, FAILURE_COPY);
navigateIntent.putParcelableArrayListExtra(EXTRA_SRC_LIST, mFailedFiles);
@@ -200,7 +200,7 @@ public class CopyService extends IntentService {
mIsCancelled = false;
final Context context = getApplicationContext();
- final Intent navigateIntent = new Intent(context, StandaloneActivity.class);
+ final Intent navigateIntent = new Intent(context, DocumentsActivity.class);
navigateIntent.putExtra(EXTRA_STACK, (Parcelable) stack);
mProgressBuilder = new Notification.Builder(this)