commit 3d4bed1ed0ebf8df211bb03cc89d1327dd492aef
author Daniel Lehmann <lehmannd@google.com> Wed Aug 22 17:53:12 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 22 17:53:12 2012 -0700
tree 5d4e8c3f508084508487c81e4f0ee69af3ef40ea
parent b131bf009b4a6db106d0ee51a89f5e9d241511fd
parent 15102c1177c9cec0fce0f2d220b514fe72dcac4e

Merge "Guarded the getActivity() call" into jb-mr1-dev

src/com/android/contacts/detail/ContactLoaderFragment.java

diff --git a/src/com/android/contacts/detail/ContactLoaderFragment.java b/src/com/android/contacts/detail/ContactLoaderFragment.java
index 37fabb0..b3f1264 100644
--- a/src/com/android/contacts/detail/ContactLoaderFragment.java
+++ b/src/com/android/contacts/detail/ContactLoaderFragment.java
@@ -216,7 +216,7 @@
                 }
             }
             // Make sure the options menu is setup correctly with the loaded data.
-            getActivity().invalidateOptionsMenu();
+            if (getActivity() != null) getActivity().invalidateOptionsMenu();
         }
 
         @Override