am b9618446: am 0230ec94: Fix crash when switching between LTR/RTL

* commit 'b96184467a9d355e5d4a6062c7064c2ce723e9ab':
  Fix crash when switching between LTR/RTL

1 files changed, 9 insertions, 12 deletions

diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 2aa78a2d2..24177f73f 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -205,19 +205,16 @@ public class ListsFragment extends AnalyticsFragment implements CallLogQueryHand
             // On rotation the FragmentManager handles rotation. Therefore getItem() isn't called.
             // Copy the fragments that the FragmentManager finds so that we can store them in
             // instance variables for later.
-            final Fragment fragment = (Fragment) super.instantiateItem(container, position);
-            switch (getRtlPosition(position)) {
-                case TAB_INDEX_SPEED_DIAL:
-                    mSpeedDialFragment = (SpeedDialFragment) fragment;
-                    return mSpeedDialFragment;
-                case TAB_INDEX_RECENTS:
-                    mRecentsFragment = (CallLogFragment) fragment;
-                    return mRecentsFragment;
-                case TAB_INDEX_ALL_CONTACTS:
-                    mAllContactsFragment = (AllContactsFragment) fragment;
-                    return mAllContactsFragment;
+            final Fragment fragment =
+                    (Fragment) super.instantiateItem(container, getRtlPosition(position));
+            if (fragment instanceof SpeedDialFragment) {
+                mSpeedDialFragment = (SpeedDialFragment) fragment;
+            } else if (fragment instanceof CallLogFragment) {
+                mRecentsFragment = (CallLogFragment) fragment;
+            } else if (fragment instanceof AllContactsFragment) {
+                mAllContactsFragment = (AllContactsFragment) fragment;
             }
-            return super.instantiateItem(container, position);
+            return fragment;
         }
 
         @Override