Call Statistics: fix NPE on rotation

Ticket: CD-554

Change-Id: I5c5601587ee8db1f8705b36263504904882e8232

2 files changed, 11 insertions, 9 deletions

diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index b01d503f9..75d705f27 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -225,6 +225,15 @@ public class CallLogFragment extends Fragment implements CallLogQueryHandler.Lis
         }
 
         mBlockContactPresenter = new BlockContactPresenter(activity, this);
+
+        boolean isShowingRecentsTab = mLogLimit != NO_LOG_LIMIT || mDateLimit != NO_DATE_LIMIT;
+        mAdapter = ObjectFactory.newCallLogAdapter(
+                getActivity(),
+                this,
+                new ContactInfoHelper(getActivity(), currentCountryIso),
+                mVoicemailPlaybackPresenter,
+                mBlockContactPresenter,
+                isShowingRecentsTab);
     }
 
     /** Called by the CallLogQueryHandler when the list of calls has been fetched or updated. */
@@ -307,14 +316,6 @@ public class CallLogFragment extends Fragment implements CallLogQueryHandler.Lis
         mEmptyListView.setActionClickedListener(this);
 
         String currentCountryIso = GeoUtil.getCurrentCountryIso(getActivity());
-        boolean isShowingRecentsTab = mLogLimit != NO_LOG_LIMIT || mDateLimit != NO_DATE_LIMIT;
-        mAdapter = ObjectFactory.newCallLogAdapter(
-                getActivity(),
-                this,
-                new ContactInfoHelper(getActivity(), currentCountryIso),
-                mVoicemailPlaybackPresenter,
-                mBlockContactPresenter,
-                isShowingRecentsTab);
         mRecyclerView.setAdapter(mAdapter);
 
         fetchCalls();
diff --git a/src/com/android/dialer/callstats/CallStatsFragment.java b/src/com/android/dialer/callstats/CallStatsFragment.java
index ede2543c4..abccf9b38 100644
--- a/src/com/android/dialer/callstats/CallStatsFragment.java
+++ b/src/com/android/dialer/callstats/CallStatsFragment.java
@@ -104,6 +104,8 @@ public class CallStatsFragment extends Fragment implements
         cr.registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, mObserver);
 
         setHasOptionsMenu(true);
+
+        mAdapter = new CallStatsAdapter(getActivity());
     }
 
     @Override
@@ -171,7 +173,6 @@ public class CallStatsFragment extends Fragment implements
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mAdapter = new CallStatsAdapter(getActivity());
         mRecyclerView.setAdapter(mAdapter);
         updateEmptyVisibilityAndMessage();
     }