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

Prevent NPE 

cherry-pick of https://android-review.googlesource.com/#/c/45703/

Change-Id: I8d6984d90365d6bc3e9f102285a06ac9c32a98d4
This commit is contained in:
Paul Westbrook 2013-04-05 12:00:29 -07:00
parent 391a7fc0e9
commit 156163cceb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emailcommon/src/com/android/emailcommon/provider/Account.java
View File

@ -509,14 +509,16 @@ public final class Account extends EmailContent implements AccountColumns, Parce
* @return the id of the default account, or Account.NO_ACCOUNT if there are no accounts * @return the id of the default account, or Account.NO_ACCOUNT if there are no accounts
*/ */
static public long getDefaultAccountId(Context context) { static public long getDefaultAccountId(Context context) {
Cursor c = context.getContentResolver().query( final Cursor c = context.getContentResolver().query(
Account.DEFAULT_ACCOUNT_ID_URI, Account.ID_PROJECTION, null, null, null); Account.DEFAULT_ACCOUNT_ID_URI, Account.ID_PROJECTION, null, null, null);
try { try {
if (c != null && c.moveToFirst()) { if (c != null && c.moveToFirst()) {
return c.getLong(Account.ID_PROJECTION_COLUMN); return c.getLong(Account.ID_PROJECTION_COLUMN);
} }
} finally { } finally {
c.close(); if (c != null) {
c.close();
}
} }
return Account.NO_ACCOUNT; return Account.NO_ACCOUNT;
} }