summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2012-09-07 14:18:30 -0700
committerDoris Liu <tianliu@google.com>2012-09-07 14:18:30 -0700
commit9fecbe852683f1bae8dc789c089028acc1ddae20 (patch)
treeb424f5f7c2fa7bc7b01278806520a32dc9738bd6 /src/com/android
parent26749e2629882623217394b5b81950a4e04403fa (diff)
downloadpackages_apps_nfc-9fecbe852683f1bae8dc789c089028acc1ddae20.zip
packages_apps_nfc-9fecbe852683f1bae8dc789c089028acc1ddae20.tar.gz
packages_apps_nfc-9fecbe852683f1bae8dc789c089028acc1ddae20.tar.bz2
Add FLAG_ACTIVITY_NEW_TASK to viewIntent
The previous CL that set FLAG_ACTIVITY_NEW_TASK flag in pendingIntent did not fix the bug. The flag needs to be set in the view intent. Bug: 6925612 Change-Id: Ibe5892c575fdf904c800c726122c59be6af02685
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/nfc/handover/HandoverManager.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/nfc/handover/HandoverManager.java b/src/com/android/nfc/handover/HandoverManager.java
index 8983389..b4c2025 100644
--- a/src/com/android/nfc/handover/HandoverManager.java
+++ b/src/com/android/nfc/handover/HandoverManager.java
@@ -390,8 +390,7 @@ public class HandoverManager implements BluetoothProfile.ServiceListener,
notBuilder.setContentText(mContext.getString(R.string.beam_touch_to_view));
Intent viewIntent = buildViewIntent();
- PendingIntent contentIntent = PendingIntent.getActivity(mContext, 0, viewIntent,
- Intent.FLAG_ACTIVITY_NEW_TASK);
+ PendingIntent contentIntent = PendingIntent.getActivity(mContext, 0, viewIntent, 0);
notBuilder.setContentIntent(contentIntent);
@@ -538,7 +537,7 @@ public class HandoverManager implements BluetoothProfile.ServiceListener,
Uri uri = mediaUri != null ? mediaUri :
Uri.parse(ContentResolver.SCHEME_FILE + "://" + filePath);
viewIntent.setDataAndTypeAndNormalize(uri, mimeTypes.get(filePath));
-
+ viewIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
return viewIntent;
}