From 2208f5dce9749b3e7a98bd3bcd445503b0c35c00 Mon Sep 17 00:00:00 2001 From: Marc Blank Date: Wed, 3 Aug 2011 12:56:47 -0700 Subject: [PATCH] Fix NPE in NfcHandler Bug: 5115848 Change-Id: I8e581aa77363bc1f33eb3267be5c924fba772aae --- src/com/android/email/activity/NfcHandler.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/com/android/email/activity/NfcHandler.java b/src/com/android/email/activity/NfcHandler.java index ec62a51fb..f41dc24ea 100644 --- a/src/com/android/email/activity/NfcHandler.java +++ b/src/com/android/email/activity/NfcHandler.java @@ -16,15 +16,13 @@ package com.android.email.activity; -import com.android.emailcommon.provider.Account; - import android.app.Activity; -import android.content.Context; import android.nfc.NdefMessage; import android.nfc.NdefRecord; import android.nfc.NfcAdapter; import android.text.TextUtils; -import android.util.Log; + +import com.android.emailcommon.provider.Account; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -42,7 +40,6 @@ public class NfcHandler implements NfcAdapter.NdefPushCallback { private UIControllerBase mUiController; private Activity mActivity; private String mCurrentEmail; - private static final String TAG = "ContactsNfcHandler"; public NfcHandler(UIControllerBase controller, Activity activity) { @@ -54,8 +51,8 @@ public class NfcHandler implements NfcAdapter.NdefPushCallback { public void onAccountChanged() { if (mUiController.isActualAccountSelected()) { final long accountId = mUiController.getActualAccountId(); - final Account account = Account.restoreAccountWithId( - mActivity, accountId); + final Account account = Account.restoreAccountWithId(mActivity, accountId); + if (account == null) return; mCurrentEmail = account.mEmailAddress; } else { mCurrentEmail = null;