commit d07335a54090a7c41baa99a2c0a6a869ecc6cfba
author Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 03 15:37:39 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 03 15:38:11 2010 -0700
tree a5caf69647a8dcb564e4de4877a82dcf50836771
parent d21ddb2c96e71f43eaf7addc25e163181d1ca87d

Fixing NPE and a race condition on initial load

Change-Id: Iab48097299f36366fae0849baa115feaa497b55b

src/com/android/contacts/activities/ContactBrowserActivity.java

diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index 2106f44..1ebac7b 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -384,6 +384,10 @@
      * Restores filter-specific persistent selection.
      */
     private void restoreListSelection() {
+        if (mListFragment == null) {
+            return;
+        }
+
         if (mListFragment instanceof DefaultContactBrowseListFragment
                 && mContactListFilterController != null
                 && mContactListFilterController.isLoaded()) {
@@ -392,9 +396,10 @@
             fragment.setFilter(mContactListFilterController.getFilter());
             fragment.restoreSelectedUri(mPrefs);
             fragment.requestSelectionOnScreen(false);
-        }
-
-        if (mContactContentDisplayed) {
+            if (mContactContentDisplayed) {
+                setupContactDetailFragment(mListFragment.getSelectedContactUri());
+            }
+        } else if (mContactContentDisplayed) {
             setupContactDetailFragment(mListFragment.getSelectedContactUri());
         }
     }