Merge "Apply FLAG_IMMUTABLE to stop tracing PendingIntent."
diff --git a/src/com/android/traceur/FileSender.java b/src/com/android/traceur/FileSender.java
index 42c24fc..8e29c63 100644
--- a/src/com/android/traceur/FileSender.java
+++ b/src/com/android/traceur/FileSender.java
@@ -64,7 +64,8 @@
.setContentText(context.getString(R.string.tap_to_share))
.setContentIntent(PendingIntent.getActivity(
context, traceUri.hashCode(), intent, PendingIntent.FLAG_ONE_SHOT
- | PendingIntent.FLAG_CANCEL_CURRENT))
+ | PendingIntent.FLAG_CANCEL_CURRENT
+ | PendingIntent.FLAG_IMMUTABLE))
.setAutoCancel(true)
.setLocalOnly(true)
.setColor(context.getColor(
diff --git a/src/com/android/traceur/Receiver.java b/src/com/android/traceur/Receiver.java
index 7e8a2f1..db7ff57 100644
--- a/src/com/android/traceur/Receiver.java
+++ b/src/com/android/traceur/Receiver.java
@@ -243,7 +243,8 @@
.setContentText(msg)
.setContentIntent(PendingIntent.getActivity(
context, 0, sendIntent, PendingIntent.FLAG_ONE_SHOT
- | PendingIntent.FLAG_CANCEL_CURRENT))
+ | PendingIntent.FLAG_CANCEL_CURRENT
+ | PendingIntent.FLAG_IMMUTABLE))
.setAutoCancel(true)
.setLocalOnly(true)
.setColor(context.getColor(
diff --git a/src/com/android/traceur/TraceService.java b/src/com/android/traceur/TraceService.java
index b06f3f7..73b902a 100644
--- a/src/com/android/traceur/TraceService.java
+++ b/src/com/android/traceur/TraceService.java
@@ -119,7 +119,7 @@
.setTicker(title)
.setContentText(msg)
.setContentIntent(
- PendingIntent.getBroadcast(context, 0, stopIntent, 0))
+ PendingIntent.getBroadcast(context, 0, stopIntent, PendingIntent.FLAG_IMMUTABLE))
.setOngoing(true)
.setLocalOnly(true)
.setColor(getColor(