From 46da9be5098b63543d67183837e797ed2068d18d Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 27 Jun 2016 14:58:34 -0700
Subject: [PATCH] By default select current country in support phone list.

Bug: 29105266
Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6
---
 src/com/android/settings/dashboard/SupportItemAdapter.java   | 1 +
 src/com/android/settings/overlay/SupportFeatureProvider.java | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 901ea088c3d..9d12ec091e3 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -83,6 +83,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
         // Optimistically assume we have Internet access. It will be updated later to correct value.
         mHasInternet = true;
         setAccount(mSupportFeatureProvider.getSupportEligibleAccount(mActivity));
+        mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);
         refreshData();
     }
 
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 75f526971d7..c5356221f7c 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -62,6 +62,11 @@ public interface SupportFeatureProvider {
      */
     boolean isOperatingNow(@SupportType int type);
 
+    /**
+     * Returns the current country code if it has a operation config, otherwise returns null.
+     */
+    String getCurrentCountryCodeIfHasConfig(@SupportType int type);
+
     /**
      * Returns localized string for operation hours in specified country. If country is null, use
      * current country to figure out operation hours.