From b5049ebb518946a591920154f4350874881d4901 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Tue, 7 Jan 2014 16:38:26 -0800
Subject: [PATCH 01/11] Fix a crash bringing up settings

Change-Id: If29fc7a4113ed7245cd82e6b26c63f08f4b9db2d
---
 src/com/android/email/activity/setup/AccountSettings.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java
index 00e4386e2..0a6e28339 100644
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ b/src/com/android/email/activity/setup/AccountSettings.java
@@ -344,6 +344,7 @@ public class AccountSettings extends PreferenceActivity implements FeedbackEnabl
         // We need to make sure that a fragment about to be attached is valid. This corrects
         // a security vulnerability.
         return (TextUtils.equals(AccountSettingsFragment.class.getName(), fragmentName) ||
+                TextUtils.equals(GeneralPreferences.class.getName(), fragmentName) ||
                 super.isValidFragment(fragmentName));
     }
 

From dd2a3a31725fff14cd67c6994dbdcff3ff27562b Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Thu, 20 Feb 2014 14:32:22 -0800
Subject: [PATCH 02/11] Fix temporary setup flow on tablets

b/13105763

Change-Id: I63f6956afbbaceadfc1a77701c6f256705601c09
---
 .../account_setup_basics.xml                  | 22 ++++++++-----------
 .../account_setup_basics.xml                  | 18 ++++++---------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/res/layout-sw600dp-land/account_setup_basics.xml b/res/layout-sw600dp-land/account_setup_basics.xml
index 76c2e1503..085bd968b 100644
--- a/res/layout-sw600dp-land/account_setup_basics.xml
+++ b/res/layout-sw600dp-land/account_setup_basics.xml
@@ -46,29 +46,25 @@
             android:background="@color/account_setup_divider_color" />
 
         <!-- Buttons on the right -->
-        <Button
+        <TextView
             android:id="@+id/manual_setup"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_below="@+id/top_divider"
             android:layout_alignParentRight="true"
             android:layout_marginTop="@dimen/setup_buttons_padding_top"
             android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/account_setup_basics_manual_setup_action" />
-        <Button
-            android:id="@+id/oauth_setup"
+        <ImageButton
+            android:id="@+id/next"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_below="@+id/manual_setup"
             android:layout_alignParentRight="true"
             android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
             android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
-            android:text="@string/account_setup_basics_oauth_setup_action" />
-        <Button
-            android:id="@+id/next"
-            android:layout_below="@+id/oauth_setup"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
-            android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
+            android:src="@drawable/ic_nav_arrow_forward"
             android:text="@string/next_action" />
 
         <!-- Frame on the left containing the (common) setup info -->
diff --git a/res/layout-sw600dp-port/account_setup_basics.xml b/res/layout-sw600dp-port/account_setup_basics.xml
index 8d973e650..ab17ea672 100644
--- a/res/layout-sw600dp-port/account_setup_basics.xml
+++ b/res/layout-sw600dp-port/account_setup_basics.xml
@@ -78,26 +78,22 @@
             android:layout_marginBottom="@dimen/setup_buttons_padding_bottom"
             >
             <!-- Buttons below -->
-            <Button
+            <TextView
                 android:id="@+id/manual_setup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentLeft="true"
                 android:layout_marginLeft="@dimen/setup_buttons_padding_left"
-                style="@style/accountSetupButton"
                 android:text="@string/account_setup_basics_manual_setup_action" />
-            <Button
-                android:id="@+id/oauth_setup"
-                android:layout_below="@+id/manual_setup"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="@dimen/setup_buttons_padding_left"
-                style="@style/accountSetupButton"
-                android:text="@string/account_setup_basics_oauth_setup_action" />
-            <Button
+            <ImageButton
                 android:id="@+id/next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="@dimen/setup_buttons_padding_right"
-                style="@style/accountSetupButton"
+                android:src="@drawable/ic_nav_arrow_forward"
                 android:text="@string/next_action" />
         </RelativeLayout>
     </LinearLayout>

From b4175c0b2adb58a8e5778d4d49fc26c8454c91ee Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Mon, 24 Mar 2014 12:52:41 -0700
Subject: [PATCH 03/11] Update version

Change-Id: I0b23c282e7816029ccc95ea0d4fa58ba4fa1cb8b

Conflicts:
	AndroidManifest.xml
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ab21b96ae..1d513d56b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,7 @@
           on the same date. This should start at zero. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.email"
-    android:versionCode="6303240" >
+    android:versionCode="6203240" >
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

From 8fb01a6031d3470c282ed84c3168986eb1bf7a69 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Mon, 24 Mar 2014 15:29:35 -0700
Subject: [PATCH 04/11] Update Email major version number to 6.3 so that it
 matches EmailGoogle

Change-Id: If49106af7769933515d4baa432a024dd3631aa4a
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1d513d56b..ab21b96ae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,7 @@
           on the same date. This should start at zero. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.email"
-    android:versionCode="6203240" >
+    android:versionCode="6303240" >
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

From 0f61caac97f633a68b7d77399d1daa56fbcf28f0 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Tue, 25 Mar 2014 15:51:06 -0700
Subject: [PATCH 05/11] Actually install the correct views when credentials
 fragment is in standalone mode

b/13638835

Change-Id: I7800cf0638097ae70c0b22384e2effc09c6ab2e3
---
 res/layout/account_credentials_fragment.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/account_credentials_fragment.xml b/res/layout/account_credentials_fragment.xml
index 4d80e7a6f..e7861d9e3 100644
--- a/res/layout/account_credentials_fragment.xml
+++ b/res/layout/account_credentials_fragment.xml
@@ -23,8 +23,8 @@
         android:paddingLeft="@dimen/setup_fragment_padding_side"
         android:paddingRight="@dimen/setup_fragment_padding_side" >
 
-    <FrameLayout
-            android:id="@+id/account_credentials_fragment_container"
+    <include
+            layout="@layout/account_setup_credentials_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 

From c71ef9e2c78c777dc49ea79a498b6b8ee1df4870 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Wed, 26 Mar 2014 10:38:51 -0700
Subject: [PATCH 06/11] Fix a NPE trying to download an attachment

b/13642247

Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
---
 src/com/android/email/service/EmailServiceStub.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java
index cb13a0f29..cd9dbdf6e 100644
--- a/src/com/android/email/service/EmailServiceStub.java
+++ b/src/com/android/email/service/EmailServiceStub.java
@@ -155,8 +155,10 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
             // 2. Open the remote folder.
             final Account account = Account.restoreAccountWithId(mContext, message.mAccountKey);
             Mailbox mailbox = Mailbox.restoreMailboxWithId(mContext, message.mMailboxKey);
-
-            if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
+            if (mailbox == null) {
+                // This could be null if the account is deleted at just the wrong time.
+                return;
+            } else if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
                 long sourceId = Utility.getFirstRowLong(mContext, Body.CONTENT_URI,
                         new String[] {BodyColumns.SOURCE_MESSAGE_KEY},
                         BodyColumns.MESSAGE_KEY + "=?",

From 7ebbb973f8d641250bbf374a18b5ecef5891a0cc Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Wed, 26 Mar 2014 11:35:42 -0700
Subject: [PATCH 07/11] Increase touch target for adding authentication

b/13642313

Change-Id: I9681cd6ad21e4da76cac3202dc61bdc49b978c71
---
 res/layout-w600dp/authentication_view.xml | 14 ++++----------
 res/layout/authentication_view.xml        | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/res/layout-w600dp/authentication_view.xml b/res/layout-w600dp/authentication_view.xml
index 03be41078..d505b5cd9 100644
--- a/res/layout-w600dp/authentication_view.xml
+++ b/res/layout-w600dp/authentication_view.xml
@@ -23,21 +23,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/add_authentication"
-            android:contentDescription="@string/add_authentication_label"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:clickable="true"
-            android:src="@drawable/ic_setup_add_authentication"/>
-
         <TextView
-            android:id="@+id/add_authentication_label"
+            android:id="@+id/add_authentication"
             android:text="@string/add_authentication_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_weight="1"
-            android:paddingRight="16dip"
+            android:padding="16dip"
+            android:drawablePadding="16dip"
+            android:drawableStart="@drawable/ic_setup_add_authentication"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimary"/>
     </LinearLayout>
diff --git a/res/layout/authentication_view.xml b/res/layout/authentication_view.xml
index e3be57d36..cd8695065 100644
--- a/res/layout/authentication_view.xml
+++ b/res/layout/authentication_view.xml
@@ -32,21 +32,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/add_authentication"
-            android:contentDescription="@string/add_authentication_label"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:clickable="true"
-            android:paddingRight="16dip"
-            android:src="@drawable/ic_setup_add_authentication"/>
-
         <TextView
-            android:id="@+id/add_authentication_label"
+            android:id="@+id/add_authentication"
             android:text="@string/add_authentication_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_weight="1"
+            android:padding="16dip"
+            android:drawablePadding="16dip"
+            android:drawableStart="@drawable/ic_setup_add_authentication"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimary"/>
     </LinearLayout>

From 60da1e4eedc9c99d29933692d471770f4ad9f1e3 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Thu, 27 Mar 2014 12:59:10 -0700
Subject: [PATCH 08/11] Add logging to help track down a bug causing invalid
 credentials

b/13640564

Change-Id: I1161764e1278375eb786689a11e6899e8363fc8b
---
 .../src/com/android/emailcommon/provider/Credential.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/emailcommon/src/com/android/emailcommon/provider/Credential.java b/emailcommon/src/com/android/emailcommon/provider/Credential.java
index 21d25282d..faeada6c2 100644
--- a/emailcommon/src/com/android/emailcommon/provider/Credential.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Credential.java
@@ -6,8 +6,10 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
 import com.android.emailcommon.utility.Utility;
+import com.android.mail.utils.LogUtils;
 import com.google.common.base.Objects;
 
 public class Credential extends EmailContent implements Parcelable {
@@ -154,6 +156,9 @@ public class Credential extends EmailContent implements Parcelable {
    @Override
    public ContentValues toContentValues() {
        ContentValues values = new ContentValues();
+       if (TextUtils.isEmpty(mProviderId)) {
+           LogUtils.e(LogUtils.TAG, new Throwable(), "Credential being saved with no provider");
+       }
        values.put(PROVIDER_COLUMN, mProviderId);
        values.put(ACCESS_TOKEN_COLUMN, mAccessToken);
        values.put(REFRESH_TOKEN_COLUMN, mRefreshToken);

From 41ba894b7bd7e310e635698e3e2487f095132bf8 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Thu, 27 Mar 2014 13:06:55 -0700
Subject: [PATCH 09/11] Upgrade my logging from .e to .wtf

b/13640564

Change-Id: I360aa6bab99cc1c414b4f89fcfe3c82eb6e282c3
---
 .../src/com/android/emailcommon/provider/Credential.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emailcommon/src/com/android/emailcommon/provider/Credential.java b/emailcommon/src/com/android/emailcommon/provider/Credential.java
index faeada6c2..b0027c07e 100644
--- a/emailcommon/src/com/android/emailcommon/provider/Credential.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Credential.java
@@ -157,7 +157,7 @@ public class Credential extends EmailContent implements Parcelable {
    public ContentValues toContentValues() {
        ContentValues values = new ContentValues();
        if (TextUtils.isEmpty(mProviderId)) {
-           LogUtils.e(LogUtils.TAG, new Throwable(), "Credential being saved with no provider");
+           LogUtils.wtf(LogUtils.TAG, "Credential being saved with no provider");
        }
        values.put(PROVIDER_COLUMN, mProviderId);
        values.put(ACCESS_TOKEN_COLUMN, mAccessToken);

From e678e39ece15cc050b89cf397627251586449928 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 17 Jul 2014 15:43:12 -0700
Subject: [PATCH 10/11] Remove deprecated locales

Change-Id: I163e2b7fbe321fce2ee6b59c2370f109ffc05984
---
 res/values-rm/strings.xml | 525 --------------------------------------
 1 file changed, 525 deletions(-)
 delete mode 100644 res/values-rm/strings.xml

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
deleted file mode 100644
index 870cdbfec..000000000
--- a/res/values-rm/strings.xml
+++ /dev/null
@@ -1,525 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for permission_read_attachment_label (9208086010625033590) -->
-    <skip />
-    <!-- no translation found for permission_read_attachment_desc (3394721085306308972) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_label (378256653525377586) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (6296566558584670348) -->
-    <skip />
-    <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
-    <string name="next_action" msgid="3931301986364184415">"Vinavant"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
-    <string name="done_action" msgid="7497990549515580249">"Terminà"</string>
-    <!-- no translation found for create_action (3062715563215392251) -->
-    <skip />
-    <!-- no translation found for quick_responses_empty_view (3960050972306132367) -->
-    <skip />
-    <string name="account_settings_action" msgid="4494079183315085171">"Parameters dal conto"</string>
-    <!-- no translation found for menu_folder_options (2871906096248843471) -->
-    <skip />
-    <!-- no translation found for status_network_error (2611654064403817391) -->
-    <skip />
-    <!-- no translation found for move_messages:one (320885379869442589) -->
-    <!-- no translation found for move_messages:other (371256717624461324) -->
-    <!-- no translation found for cannot_move_protocol_not_supported_toast (6558083148128616292) -->
-    <skip />
-    <!-- no translation found for cannot_move_multiple_accounts_toast (7922594026384944163) -->
-    <skip />
-    <!-- no translation found for cannot_move_special_mailboxes_toast (7093107954841896970) -->
-    <skip />
-    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Posta entrada"</string>
-    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Posta sortida"</string>
-    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Sbozs"</string>
-    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Chanaster da palpiri"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Tramess"</string>
-    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Nungiavischà"</string>
-    <!-- no translation found for mailbox_name_display_starred (7788694947644186069) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_unread (1015674989793998695) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_inbox (7518263761297423255) -->
-    <skip />
-    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Cun staila"</string>
-    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Sbozs"</string>
-    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Posta sortida"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
-    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Messadi original --------\nObject: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDa: <xliff:g id="SENDER">%2$s</xliff:g>\nA: <xliff:g id="TO">%3$s</xliff:g>\nCc: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <!-- no translation found for message_compose_insert_quick_response_list_title (5314107302508728189) -->
-    <skip />
-    <!-- no translation found for message_compose_insert_quick_response_menu_title (5817075097532919955) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_background_load (7906875687519445185) -->
-    <skip />
-    <!-- no translation found for attachment_not_found (7155322700141145123) -->
-    <skip />
-    <!-- no translation found for message_decode_error (5016042255170947834) -->
-    <skip />
-    <!-- no translation found for forward_download_failed_ticker (6176608320359303255) -->
-    <skip />
-    <!-- no translation found for forward_download_failed_title (6139701848515572511) -->
-    <skip />
-    <!-- no translation found for login_failed_ticker (2169365211566829350) -->
-    <skip />
-    <!-- no translation found for login_failed_title (7624349996212476176) -->
-    <skip />
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <!-- no translation found for account_setup_basics_title (3578333196594678422) -->
-    <skip />
-    <!-- no translation found for oauth_authentication_title (4096761972487140963) -->
-    <skip />
-    <!-- no translation found for sign_in_title (8509755024484685915) -->
-    <skip />
-    <!-- no translation found for oauth_error_description (5257268852139229456) -->
-    <skip />
-    <!-- no translation found for password_warning_label (1479956455912041077) -->
-    <skip />
-    <!-- no translation found for email_confirmation_label (1082319634606902954) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
-    <!-- no translation found for accounts_welcome (8337750045270269649) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
-    <skip />
-    <!-- no translation found for or_label (2207403489755254427) -->
-    <skip />
-    <!-- no translation found for sign_in_with_google (9051489501495503976) -->
-    <skip />
-    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
-    <skip />
-    <!-- no translation found for password_hint (8835390747504721561) -->
-    <skip />
-    <!-- no translation found for signed_in_with_service_label (4909910797357155961) -->
-    <skip />
-    <!-- no translation found for authentication_label (6917956186120234602) -->
-    <skip />
-    <!-- no translation found for add_authentication_label (865206092644419804) -->
-    <skip />
-    <!-- no translation found for clear_authentication_label (8113966442068335059) -->
-    <skip />
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuraziun manuala"</string>
-    <!-- no translation found for account_setup_username_password_toast (3968270274727947460) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_title (8089732986912704425) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (6447629283679935840) -->
-    <skip />
-    <!-- no translation found for account_password_spaces_error (8928309156658903257) -->
-    <skip />
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperar las infurmaziuns davart il conto…"</string>
-    <!-- no translation found for account_setup_check_settings_check_incoming_msg (2869198335297585862) -->
-    <skip />
-    <!-- no translation found for account_setup_check_settings_check_outgoing_msg (4566131393776891419) -->
-    <skip />
-    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
-    <skip />
-    <!-- no translation found for account_setup_ab_headline (7110531768613341908) -->
-    <skip />
-    <!-- no translation found for account_setup_ab_instructions_format (2107254631013471380) -->
-    <skip />
-    <!-- no translation found for account_setup_names_title (8483517350241119291) -->
-    <skip />
-    <!-- no translation found for account_setup_names_headline (914858472109729140) -->
-    <skip />
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar in num al conto (facultativ)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Voss num (vegn mussà en messadis che sortan)"</string>
-    <!-- no translation found for account_setup_names_user_name_empty_error (6791427018325367364) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_title (7156551693961182124) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Da tge tip da conto sa tracti?"</string>
-    <!-- no translation found for account_setup_incoming_title (6796626791039136005) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
-    <skip />
-    <!-- no translation found for account_setup_password_subheading (2072179928666715013) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
-    <skip />
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nagin"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (6151855090123117538) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (2798501138420163861) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (6149084428423662620) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (6573498431821879660) -->
-    <skip />
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Stizzar ils e-mails dal server"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Mai"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Sche jau stiz els da la posta entrada"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefix da la via d\'access IMAP"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facultativ"</string>
-    <!-- no translation found for account_setup_outgoing_title (7208495965665711539) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_require_login_label (7779484127897397562) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
-    <skip />
-    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
-    <skip />
-    <!-- no translation found for account_setup_exchange_select_certificate (1536103662037268683) -->
-    <skip />
-    <!-- no translation found for account_setup_exchange_use_certificate (8690682770083161349) -->
-    <skip />
-    <!-- no translation found for account_setup_exchange_remove_certificate (5633249155510301766) -->
-    <skip />
-    <!-- no translation found for account_setup_exchange_no_certificate (1119542961954780872) -->
-    <skip />
-    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
-    <skip />
-    <!-- no translation found for account_setup_options_title (9016600767888846051) -->
-    <skip />
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_label (8321552620846334354) -->
-    <skip />
-    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Mai"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticamain (push)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Mintga 5 minutas"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Mintga 10 minutas"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Mintga 15 minutas"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Mintga 30 minutas"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Mintga ura"</string>
-    <!-- no translation found for account_setup_options_notify_label (7046146571560728829) -->
-    <skip />
-    <!-- no translation found for account_setup_options_sync_contacts_label (276492345599531778) -->
-    <skip />
-    <!-- no translation found for account_setup_options_sync_calendar_label (3222151135467189411) -->
-    <skip />
-    <!-- no translation found for account_setup_options_sync_email_label (8585177128405004068) -->
-    <skip />
-    <!-- no translation found for account_setup_options_background_attachments_label (5247749298276451846) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_title (9083263347962940552) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_label (7603869690500525594) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_auto (4188895354366183790) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_1day (7727436096227637646) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_3days (1841106793912850270) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_1week (5804121771990249346) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_2weeks (3583478100026382495) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_1month (4289585173153789717) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_all (5372861827683632364) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_default (2540360826995543134) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_auth_message (426627755590431364) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_auth_message_fmt (2081384892947238930) -->
-    <skip />
-    <!-- no translation found for account_setup_autodiscover_dlg_authfail_title (7365992662150541370) -->
-    <skip />
-    <!-- no translation found for account_setup_autodiscover_dlg_authfail_message (8354874879956702097) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_certificate_message (3836152264696108805) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_certificate_message_fmt (2121921642915593041) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_certificate_required (2689944595775206006) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_certificate_inaccessible (3563840279690749547) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_check_credentials_message (6531658092540248067) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_server_message (4942810054116129684) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_server_message_fmt (2525425638303883232) -->
-    <skip />
-    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS è obligatoric ma na vegn betg sustegnì dal server."</string>
-    <!-- no translation found for account_setup_failed_auth_required (6799839150250217566) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_security (925820957665764964) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_ioerror (7802604687451830378) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_protocol_unsupported (4607759927226943569) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_access_denied (6835358740050287051) -->
-    <skip />
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administraziun da la segirezza a distanza"</string>
-    <!-- no translation found for account_setup_security_policies_required_fmt (5410714107656671761) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_security_policies_unsupported (3210264746877120355) -->
-    <skip />
-    <!-- no translation found for account_setup_username_uneditable_error (1618869759801584109) -->
-    <skip />
-    <!-- no translation found for disable_admin_warning (6196985268695592382) -->
-    <skip />
-    <!-- no translation found for account_security_dialog_title (430041952584831904) -->
-    <skip />
-    <!-- no translation found for account_security_dialog_content_fmt (8843806143923278214) -->
-    <skip />
-    <!-- no translation found for security_unsupported_ticker_fmt (5166579214529283975) -->
-    <skip />
-    <!-- no translation found for security_needed_ticker_fmt (2120499087897133665) -->
-    <skip />
-    <!-- no translation found for security_changed_ticker_fmt (2609435447352755285) -->
-    <skip />
-    <!-- no translation found for security_notification_content_update_title (2429762903228690154) -->
-    <skip />
-    <!-- no translation found for security_notification_content_change_title (443490921895642130) -->
-    <skip />
-    <!-- no translation found for security_notification_content_unsupported_title (7315219208043169233) -->
-    <skip />
-    <!-- no translation found for account_security_title (3511543138560418587) -->
-    <skip />
-    <!-- no translation found for account_security_policy_explanation_fmt (6932627044314460766) -->
-    <skip />
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifitgar ils detagls"</string>
-    <!-- no translation found for password_expire_warning_ticker_fmt (2459977229180023773) -->
-    <skip />
-    <!-- no translation found for password_expire_warning_content_title (7174669014074849304) -->
-    <skip />
-    <!-- no translation found for password_expired_ticker (4230570412974108968) -->
-    <skip />
-    <!-- no translation found for password_expired_content_title (4349518706602252979) -->
-    <skip />
-    <!-- no translation found for password_expire_warning_dialog_title (1687074175399798189) -->
-    <skip />
-    <!-- no translation found for password_expire_warning_dialog_content_fmt (4293446611405084436) -->
-    <skip />
-    <!-- no translation found for password_expired_dialog_title (2186547998125938084) -->
-    <skip />
-    <!-- no translation found for password_expired_dialog_content_fmt (6538210092073931079) -->
-    <skip />
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
-    <!-- no translation found for account_settings_login_dialog_title (4024422579146302775) -->
-    <skip />
-    <!-- no translation found for account_settings_login_dialog_content_fmt (8849649646111167377) -->
-    <skip />
-    <!-- no translation found for account_settings_login_dialog_reason_fmt (4266359321648406752) -->
-    <skip />
-    <!-- no translation found for account_settings_background_attachments_label (2980317599840958688) -->
-    <skip />
-    <!-- no translation found for account_settings_background_attachments_summary (5954218549226189376) -->
-    <skip />
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Avis ad e-mails"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"\"Frequenza da sincronisaziun, avis, etc.\""</string>
-    <!-- no translation found for account_settings_notify_summary (8134339460923068254) -->
-    <skip />
-    <!-- no translation found for account_settings_mail_check_frequency_label (4322235101687302250) -->
-    <skip />
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Messadis che entran"</string>
-    <!-- no translation found for account_settings_incoming_summary (2923044634831881068) -->
-    <skip />
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Parameters da sortida"</string>
-    <!-- no translation found for account_settings_outgoing_summary (3572093624332724311) -->
-    <skip />
-    <!-- no translation found for account_settings_enforced_label (7429582254433588882) -->
-    <skip />
-    <!-- no translation found for account_settings_enforced_summary (8140860420440447771) -->
-    <skip />
-    <!-- no translation found for account_settings_unsupported_label (1954091071454235577) -->
-    <skip />
-    <!-- no translation found for account_settings_unsupported_summary (2107633813351863608) -->
-    <skip />
-    <!-- no translation found for account_settings_retry_label (1104680719299842829) -->
-    <skip />
-    <!-- no translation found for account_settings_retry_summary (2703599639846201913) -->
-    <skip />
-    <string name="account_settings_description_label" msgid="8894815221204511715">"Num dal conto"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"Voss num"</string>
-    <!-- no translation found for account_settings_edit_quick_responses_label (3106019627675996480) -->
-    <skip />
-    <!-- no translation found for account_settings_edit_quick_responses_summary (8056686122888722591) -->
-    <skip />
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Parameters dad avis"</string>
-    <!-- no translation found for account_settings_data_usage (6669107430575866736) -->
-    <skip />
-    <!-- no translation found for account_settings_policies (6292833636418641840) -->
-    <skip />
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
-    <!-- no translation found for edit_quick_response_dialog (6479106007607928450) -->
-    <skip />
-    <!-- no translation found for save_action (1988862706623227093) -->
-    <skip />
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronisar ils contacts"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronisar ils contacts per quest conto"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronisar il chalender"</string>
-    <!-- no translation found for account_settings_sync_calendar_summary (7606340353079301703) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_enable (3754115565685222477) -->
-    <skip />
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronisar ils e-mails per quest conto"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <!-- no translation found for account_settings_ringtone (8229878374785575207) -->
-    <skip />
-    <string name="account_settings_servers" msgid="4925493817981624242">"Parameters dal server"</string>
-    <!-- no translation found for mailbox_settings_activity_title (4705845931573373274) -->
-    <skip />
-    <!-- no translation found for mailbox_settings_activity_title_with_mailbox (6485481250424219240) -->
-    <skip />
-    <!-- no translation found for mailbox_settings_sync_enabled_label (1180866791599296994) -->
-    <skip />
-    <!-- no translation found for mailbox_settings_sync_enabled_summary (345878979425044320) -->
-    <skip />
-    <!-- no translation found for mailbox_settings_mailbox_sync_window_label (851180833264474141) -->
-    <skip />
-    <!-- no translation found for prefDialogTitle_conversationListIcon (4601797400885989153) -->
-    <skip />
-    <!-- no translation found for provider_note_live (2995297671709325333) -->
-    <skip />
-    <!-- no translation found for provider_note_t_online (1630642061431427894) -->
-    <skip />
-    <string name="exchange_name" msgid="1190783774800310346">"Da fatschenta"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <!-- no translation found for system_account_create_failed (3673792980526246177) -->
-    <skip />
-    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"Activescha las directivas da segirezza specificas per il server"</string>
-    <!-- no translation found for settings_activity_title (5185915603716333904) -->
-    <skip />
-    <!-- no translation found for header_label_general_preferences (8243724566056800991) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_label (1863245465244241907) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_summary (6710240861010766643) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_label (4548277349553989930) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_summary (2695471027185506093) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (4693576184223089069) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (4415205108584620118) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (4550219696381691112) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (6227813549949219991) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (1197917420815786571) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for more_than_999 (8704425397397918798) -->
-    <skip />
-    <!-- no translation found for search_hint (2200412192574686497) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_camera (5744573062306937302) -->
-    <skip />
-    <!-- no translation found for policy_require_password (7177274900480984702) -->
-    <skip />
-    <!-- no translation found for policy_password_history (5743544498302303181) -->
-    <skip />
-    <!-- no translation found for policy_password_expiration (1248123255253649199) -->
-    <skip />
-    <!-- no translation found for policy_screen_timeout (414869965358468080) -->
-    <skip />
-    <!-- no translation found for policy_calendar_age (627405158087482302) -->
-    <skip />
-    <!-- no translation found for policy_email_age (7144148367145424963) -->
-    <skip />
-    <!-- no translation found for quick_1 (3426057697353380951) -->
-    <skip />
-    <!-- no translation found for quick_2 (4188036352885736617) -->
-    <skip />
-    <!-- no translation found for quick_3 (8061819976353395585) -->
-    <skip />
-    <!-- no translation found for quick_4 (3988974084396883051) -->
-    <skip />
-    <!-- no translation found for require_manual_sync_message (7777357288642785955) -->
-    <skip />
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
-    <!-- no translation found for no_conversations (5559527390337162819) -->
-    <skip />
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
-    <!-- no translation found for pop3_name (4037602724794932807) -->
-    <skip />
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
-    <!-- no translation found for no_quick_responses (5774427722506187961) -->
-    <skip />
-</resources>

From b63e70f179e01b3a4e944b7b15c6a585c07d492d Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Thu, 7 Aug 2014 11:34:55 -0700
Subject: [PATCH 11/11] Skip null/empty account types

b/16730607

Change-Id: I6b3207edbf3dc841dd2222e92f69d270a0caf773
(cherry picked from commit 1381d4083bbfdf046eceac081420ab3fa7a1ae81)
---
 src/com/android/email/provider/EmailProvider.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index abf60d54d..096bcf712 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -1614,7 +1614,10 @@ public class EmailProvider extends ContentProvider
         // Find all possible account types
         final Set<String> accountTypes = new HashSet<String>(3);
         for (final EmailServiceInfo info : infos) {
-            accountTypes.add(info.accountType);
+            if (!TextUtils.isEmpty(info.accountType)) {
+                // accountType will be empty for the gmail stub entry
+                accountTypes.add(info.accountType);
+            }
         }
         // Find all accounts we own
         final List<android.accounts.Account> amAccounts = new ArrayList<android.accounts.Account>();
@@ -1626,11 +1629,7 @@ public class EmailProvider extends ContentProvider
         int restoredCount = 0;
         for (final android.accounts.Account amAccount : amAccounts) {
             String jsonString = null;
-            try {
                 jsonString = am.getUserData(amAccount, ACCOUNT_MANAGER_JSON_TAG);
-            } catch (SecurityException e) {
-                LogUtils.e(TAG, e, "catching exception");
-            }
             if (TextUtils.isEmpty(jsonString)) {
                 continue;
             }