From 156163cceb5f56bb53e88e68d4e79bd5c076797f Mon Sep 17 00:00:00 2001 From: Paul Westbrook Date: Fri, 5 Apr 2013 12:00:29 -0700 Subject: [PATCH] Prevent NPE cherry-pick of https://android-review.googlesource.com/#/c/45703/ Change-Id: I8d6984d90365d6bc3e9f102285a06ac9c32a98d4 --- .../src/com/android/emailcommon/provider/Account.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/emailcommon/src/com/android/emailcommon/provider/Account.java b/emailcommon/src/com/android/emailcommon/provider/Account.java index e9b7d805e..b9776ab43 100755 --- a/emailcommon/src/com/android/emailcommon/provider/Account.java +++ b/emailcommon/src/com/android/emailcommon/provider/Account.java @@ -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 */ 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); try { if (c != null && c.moveToFirst()) { return c.getLong(Account.ID_PROJECTION_COLUMN); } } finally { - c.close(); + if (c != null) { + c.close(); + } } return Account.NO_ACCOUNT; }