commit fa3c78d3e506d466dfe2ea9e8caef2b906f331fd
author Daniel Lehmann <lehmannd@google.com> Mon May 16 20:22:13 2011 -0700
committer Daniel Lehmann <lehmannd@google.com> Mon May 16 20:22:13 2011 -0700
tree 35dd691f0ca37dadd6d79dc0129f5352fc806550
parent a911cc61416aa22e3e0ffa1f4f4bcf38d09470d7

Fix a rare null reference exception

Change-Id: I35960d8fc683fbf5d0ca6254b289e52ceb2e7a7e

src/com/android/contacts/calllog/CallLogFragment.java

diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index 3850a0b..5872043 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -806,8 +806,8 @@
         @Override
         protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
             final CallLogFragment fragment = mFragment.get();
-            // TODO: Do we still need the isFinishing check if we use a fragmented-Tabs?
-            if (fragment != null && !fragment.getActivity().isFinishing()) {
+            if (fragment != null && fragment.getActivity() != null &&
+                    !fragment.getActivity().isFinishing()) {
                 final CallLogFragment.CallLogAdapter callsAdapter = fragment.mAdapter;
                 callsAdapter.setLoading(false);
                 callsAdapter.changeCursor(cursor);