From eadc7dc815522f69658982905239c734266fbcc2 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 12 Jul 2016 14:10:22 -0700
Subject: [PATCH] Request support rules to refresh when account changes.

Bug: 30079512

When account is added, operation rule can potentially change. Request a
refresh to make sure user sees the latest UI.

Change-Id: I89e9d97bec22d612ca3602d86cc63f8f06355a39
---
 src/com/android/settings/dashboard/SupportItemAdapter.java   | 3 ++-
 src/com/android/settings/overlay/SupportFeatureProvider.java | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 52440e9bbda..1d4e99adca1 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -89,7 +89,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
         } else {
             mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);
         }
-        setAccount(mSupportFeatureProvider.getSupportEligibleAccount(mActivity));
+        mAccount = mSupportFeatureProvider.getSupportEligibleAccount(mActivity);
         refreshData();
     }
 
@@ -155,6 +155,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
     public void setAccount(Account account) {
         if (!Objects.equals(mAccount, account)) {
             mAccount = account;
+            mSupportFeatureProvider.refreshOperationRules();
             refreshData();
         }
     }
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 4d8e3d69091..45713e4eef3 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -51,6 +51,11 @@ public interface SupportFeatureProvider {
      */
     boolean isSupportTypeEnabled(Context context, @SupportType int type);
 
+    /**
+     * Refreshes all operation rules.
+     */
+    void refreshOperationRules();
+
     /**
      * Whether or not a support type is in operation 24/7. If country is null, use
      * current country.