ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 1381d408: Skip null/empty account types

Browse Source 
* commit '1381d4083bbfdf046eceac081420ab3fa7a1ae81':
  Skip null/empty account types
This commit is contained in:
Tony Mantler 2014-08-07 20:24:49 +00:00 committed by Android Git Automerger
commit f0deafc816
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/email/provider/EmailProvider.java
View File

@ -1614,7 +1614,10 @@ public class EmailProvider extends ContentProvider
// Find all possible account types // Find all possible account types
final Set<String> accountTypes = new HashSet<String>(3); final Set<String> accountTypes = new HashSet<String>(3);
for (final EmailServiceInfo info : infos) { 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 // Find all accounts we own
final List<android.accounts.Account> amAccounts = new ArrayList<android.accounts.Account>(); final List<android.accounts.Account> amAccounts = new ArrayList<android.accounts.Account>();
@ -1626,11 +1629,7 @@ public class EmailProvider extends ContentProvider
int restoredCount = 0; int restoredCount = 0;
for (final android.accounts.Account amAccount : amAccounts) { for (final android.accounts.Account amAccount : amAccounts) {
String jsonString = null; String jsonString = null;
try {
jsonString = am.getUserData(amAccount, ACCOUNT_MANAGER_JSON_TAG); jsonString = am.getUserData(amAccount, ACCOUNT_MANAGER_JSON_TAG);
} catch (SecurityException e) {
LogUtils.e(TAG, e, "catching exception");
}
if (TextUtils.isEmpty(jsonString)) { if (TextUtils.isEmpty(jsonString)) {
continue; continue;
} }