From 0a17fcfae53d75f1a9e9b897b041a4696e7f7683 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Fri, 1 Aug 2014 11:39:36 -0700
Subject: [PATCH] temp fix for b/16730607

Change-Id: I1474955d82442ad10527e2a308fa19bec7b144e9
---
 src/com/android/email/provider/EmailProvider.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 42df12bc8..dc8ef60fa 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -1625,7 +1625,12 @@ public class EmailProvider extends ContentProvider
         // Try to restore them from saved JSON
         int restoredCount = 0;
         for (final android.accounts.Account amAccount : amAccounts) {
-            final String jsonString = am.getUserData(amAccount, ACCOUNT_MANAGER_JSON_TAG);
+            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;
             }