Merge "Fix a bug where selected country is reset." into nyc-mr1-dev

diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 46588f9..8f2be01 100644 (file)
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -86,9 +86,10 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
         mHasInternet = true;
         if (savedInstanceState != null) {
             mSelectedCountry = savedInstanceState.getString(STATE_SELECTED_COUNTRY);
+        } else {
+            mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);
         }
         setAccount(mSupportFeatureProvider.getSupportEligibleAccount(mActivity));
-        mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);
         refreshData();
     }