am 20c8a9fc: am 647e7c65: am 9dcc45a2: am 195b6213: Merge "Set the package name in intents from the widget" into ub-gmail-ur14-dev

* commit '20c8a9fc82a78cff689bec368c2f3933da0b3a78':
  Set the package name in intents from the widget
diff --git a/src/com/android/mail/widget/WidgetService.java b/src/com/android/mail/widget/WidgetService.java
index d8e9861..22c74a7 100644
--- a/src/com/android/mail/widget/WidgetService.java
+++ b/src/com/android/mail/widget/WidgetService.java
@@ -133,12 +133,14 @@
         remoteViews.setRemoteAdapter(R.id.conversation_list, intent);
         // Open mail app when click on header
         final Intent mailIntent = Utils.createViewFolderIntent(context, folderUri, account);
+        mailIntent.setPackage(context.getPackageName());
         PendingIntent clickIntent = PendingIntent.getActivity(context, 0, mailIntent,
                 PendingIntent.FLAG_UPDATE_CURRENT);
         remoteViews.setOnClickPendingIntent(R.id.widget_header, clickIntent);
 
         // On click intent for Compose
         final Intent composeIntent = new Intent();
+        composeIntent.setPackage(context.getPackageName());
         composeIntent.setAction(Intent.ACTION_SEND);
         composeIntent.putExtra(Utils.EXTRA_ACCOUNT, account.serialize());
         composeIntent.setData(account.composeIntentUri);
@@ -157,6 +159,7 @@
 
         // On click intent for Conversation
         final Intent conversationIntent = new Intent();
+        conversationIntent.setPackage(context.getPackageName());
         conversationIntent.setAction(Intent.ACTION_VIEW);
         clickIntent = PendingIntent.getActivity(context, 0, conversationIntent,
                 PendingIntent.FLAG_UPDATE_CURRENT);