commit 57824d5aaaf544b666cd92cf0361e3330cf97458
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 30 16:51:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 30 16:51:55 2016 +0000
tree 3c831913b9e8eeab0c87e4fa76b5f45733ed660c
parent 0293fb40f277bd6782d0bb98bcd120a6328e9b6e
parent 242a7ef1e80db2e2c04973883cc675f0e8a61741

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

src/com/android/settings/dashboard/SupportItemAdapter.java

diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 46588f9..8f2be01 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -86,9 +86,10 @@
         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();
     }