diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/contacts/quickcontact/QuickContactActivity.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index e5574d90f..5afa022d6 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -1760,29 +1760,29 @@ public class QuickContactActivity extends ContactsActivity { @Override public void onLoadFinished(Loader<Contact> loader, Contact data) { Trace.beginSection("onLoadFinished()"); + try { - if (isFinishing()) { - return; - } - if (data.isError()) { - // This shouldn't ever happen, so throw an exception. The {@link ContactLoader} - // should log the actual exception. - throw new IllegalStateException("Failed to load contact", data.getException()); - } - if (data.isNotFound()) { - if (mHasAlreadyBeenOpened) { - finish(); - } else { + if (isFinishing()) { + return; + } + if (data.isError()) { + // This shouldn't ever happen, so throw an exception. The {@link ContactLoader} + // should log the actual exception. + throw new IllegalStateException("Failed to load contact", data.getException()); + } + if (data.isNotFound()) { Log.i(TAG, "No contact found: " + ((ContactLoader)loader).getLookupUri()); Toast.makeText(QuickContactActivity.this, R.string.invalidContactMessage, Toast.LENGTH_LONG).show(); + finish(); + return; } - return; - } - bindContactData(data); + bindContactData(data); - Trace.endSection(); + } finally { + Trace.endSection(); + } } @Override |