commit ebcac11695abe42e10f34f5b6894c8ff43e91cbd
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 04 23:32:26 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 04 23:32:26 2017 +0000
tree eb76772a0e5692b5f1d6d4e38a17974e1acd75e7
parent 17fd790e0d6bf3d21c3072e58890babad636a240
parent aa16ca2105bc6038edf35e3dce13977f8bc77874

Merge "Guard against null cursor when querying SIM" into ub-contactsdialer-i-dev

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 f6bbe2f..bc2c592 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -205,8 +205,6 @@
     private ContactsActionBarDrawerToggle mToggle;
     private Toolbar mToolbar;
     private NavigationView mNavigationView;
-    private GroupsFragment mGroupsFragment;
-    private AccountFiltersFragment mAccountFiltersFragment;
 
     // The account the new group will be created under.
     private AccountWithDataSet mNewGroupAccount;
@@ -423,8 +421,6 @@
             mCurrentView = ContactsView.ALL_CONTACTS;
         }
 
-        loadGroups();
-
         // Set up hamburger menu items.
         mNavigationView = (NavigationView) findViewById(R.id.nav_view);
         mNavigationView.setNavigationItemSelectedListener(this);
@@ -465,20 +461,21 @@
 
     private void addGroupsAndFiltersFragments(FragmentTransaction transaction) {
         final FragmentManager fragmentManager = getFragmentManager();
-        mGroupsFragment = (GroupsFragment) fragmentManager.findFragmentByTag(TAG_GROUPS);
-        if (mGroupsFragment == null) {
-            mGroupsFragment = new GroupsFragment();
-            transaction.add(mGroupsFragment, TAG_GROUPS);
+        GroupsFragment groupsFragment =
+                (GroupsFragment) fragmentManager.findFragmentByTag(TAG_GROUPS);
+        if (groupsFragment == null) {
+            groupsFragment = new GroupsFragment();
+            transaction.add(groupsFragment, TAG_GROUPS);
         }
-        mGroupsFragment.setListener(this);
+        groupsFragment.setListener(this);
 
-        mAccountFiltersFragment = (AccountFiltersFragment)
-                fragmentManager.findFragmentByTag(TAG_FILTERS);
-        if (mAccountFiltersFragment == null) {
-            mAccountFiltersFragment = new AccountFiltersFragment();
-            transaction.add(mAccountFiltersFragment, TAG_FILTERS);
+        AccountFiltersFragment accountFiltersFragment =
+                (AccountFiltersFragment) fragmentManager.findFragmentByTag(TAG_FILTERS);
+        if (accountFiltersFragment == null) {
+            accountFiltersFragment = new AccountFiltersFragment();
+            transaction.add(accountFiltersFragment, TAG_FILTERS);
         }
-        mAccountFiltersFragment.setListener(this);
+        accountFiltersFragment.setListener(this);
     }
 
     @Override
@@ -790,25 +787,6 @@
         }
     }
 
-    // Set up fragment manager to load groups.
-    protected void loadGroups() {
-        final FragmentManager fragmentManager = getFragmentManager();
-        final FragmentTransaction transaction = fragmentManager.beginTransaction();
-        addGroupsLoadingFragment(transaction);
-        transaction.commitAllowingStateLoss();
-        fragmentManager.executePendingTransactions();
-    }
-
-    private void addGroupsLoadingFragment(FragmentTransaction transaction) {
-        final FragmentManager fragmentManager = getFragmentManager();
-        mGroupsFragment = (GroupsFragment) fragmentManager.findFragmentByTag(TAG_GROUPS);
-        if (mGroupsFragment == null) {
-            mGroupsFragment = new GroupsFragment();
-            transaction.add(mGroupsFragment, TAG_GROUPS);
-        }
-        mGroupsFragment.setListener(this);
-    }
-
     private void updateViewConfiguration(boolean forceUpdate) {
         int providerStatus = mProviderStatusWatcher.getProviderStatus();
         if (!forceUpdate && (mProviderStatus != null)