From 045aa05777a097717c1a915e66eb9ab671e02d56 Mon Sep 17 00:00:00 2001
From: Ray Chen <raychen@google.com>
Date: Tue, 22 Jul 2014 11:31:37 +0200
Subject: [PATCH] Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email
 from EmailProvider.

b/16400882

Change-Id: I2765fa6cea392e07b878fe063c7234582a485b1d
---
 src/com/android/email/provider/EmailProvider.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 5b7ae5e44..42df12bc8 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -2748,6 +2748,8 @@ public class EmailProvider extends ContentProvider
                     .add(UIProvider.AccountColumns.NAME, AccountColumns.DISPLAY_NAME)
                     .add(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME,
                             AccountColumns.EMAIL_ADDRESS)
+                    .add(UIProvider.AccountColumns.ACCOUNT_ID,
+                            AccountColumns.EMAIL_ADDRESS)
                     .add(UIProvider.AccountColumns.SENDER_NAME,
                             AccountColumns.SENDER_NAME)
                     .add(UIProvider.AccountColumns.UNDO_URI,
@@ -3639,6 +3641,9 @@ public class EmailProvider extends ContentProvider
             values[colPosMap.get(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME)] =
                     getContext().getString(R.string.mailbox_list_account_selector_combined_view);
         }
+        if (colPosMap.containsKey(UIProvider.AccountColumns.ACCOUNT_ID)) {
+            values[colPosMap.get(UIProvider.AccountColumns.ACCOUNT_ID)] = "Account Id";
+        }
         if (colPosMap.containsKey(UIProvider.AccountColumns.TYPE)) {
             values[colPosMap.get(UIProvider.AccountColumns.TYPE)] = "unknown";
         }