From 6d7eef22cd2634bd0da8de8e38635dd92b3e5a48 Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Thu, 8 Dec 2011 13:47:02 -0800
Subject: [PATCH] DO NOT MERGE. Fix issue where back stack is not cleared when
 opening email from a notification.

Fixes b/5716835 back stack in email gets messed up in certain circumstances

Change-Id: I499a1c19f1ebbb7e4debde690cacf17f9f6c3454
---
 src/com/android/email/NotificationController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 5ed3e012f..991f3ba73 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -443,7 +443,7 @@ public class NotificationController {
         } else {
             intent = Welcome.createOpenMessageIntent(mContext, accountId, mailboxId, messageId);
         }
-
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         long now = mClock.getTime();
         boolean enableAudio = (now - mLastMessageNotifyTime) > MIN_SOUND_INTERVAL_MS;
         Notification notification = createAccountNotification(