From 242a7ef1e80db2e2c04973883cc675f0e8a61741 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 29 Jun 2016 09:39:37 -0700
Subject: [PATCH] Fix a bug where selected country is reset.

Bug: 29397123

Bug caused by a bad merge.

Change-Id: I6cf4ea8796f712b3d2d9354a9845e9e95eda69b9
---
 src/com/android/settings/dashboard/SupportItemAdapter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 03b9fe7fe65..8475efd6bb8 100644
--- 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();
     }