commit 24eb00b986dd2b17c91dd742237f92b45aedc5ab
author James Laskey <laskey@google.com> Tue Oct 25 19:07:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 19:07:52 2016 +0000
tree aa771fc9628d9e79ec44b6fc809f8342e8fdc1e3
parent 6a3de2d7fc232c14af7374744f62560772d8788c
parent 1842bb2d35ea9d2d1f5d064448610906f872b74f

Fix crash when changing customized list setting
am: 1842bb2d35

Change-Id: I6ced301f32834817ee030064b92887471a9d27e4

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

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 3c6c35e..580b84c 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -914,9 +914,11 @@
     }
 
     private void handleFilterChangeForFragment(ContactListFilter filter) {
-        mAllFragment.setFilterAndUpdateTitle(filter);
-        // Scroll to top after filter is changed.
-        mAllFragment.scrollToTop();
+        if (mAllFragment.canSetActionBar()) {
+            mAllFragment.setFilterAndUpdateTitle(filter);
+            // Scroll to top after filter is changed.
+            mAllFragment.scrollToTop();
+        }
     }
 
     private void handleFilterChangeForActivity(ContactListFilter filter) {

src/com/android/contacts/list/DefaultContactBrowseListFragment.java

diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index d491afd..c407dcc 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -135,6 +135,8 @@
     private boolean mIsRecreatedInstance;
     private boolean mOptionsMenuContactsAvailable;
 
+    private boolean mCanSetActionBar = false;
+
     /**
      * If {@link #configureFragment()} is already called. Used to avoid calling it twice
      * in {@link #onResume()}.
@@ -658,6 +660,7 @@
         }
 
         setDirectorySearchMode();
+        mCanSetActionBar = true;
     }
 
     public void initializeActionBarAdapter(Bundle savedInstanceState) {
@@ -1214,4 +1217,8 @@
 
         return false;
     }
+
+    public boolean canSetActionBar() {
+        return mCanSetActionBar;
+    }
 }