commit 987eadbd4b019d8c41661f76f1ff943a2f490d0a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 13 01:13:01 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 13 01:13:01 2016 +0000
tree e292faf189534ee15a168710fab51417acdfe10c
parent 22f5b479b558bfe7713a767be576f105a083c655
parent eadc7dc815522f69658982905239c734266fbcc2

Merge "Request support rules to refresh when account changes." 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 52440e9..1d4e99a 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -89,7 +89,7 @@
         } else {
             mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);
         }
-        setAccount(mSupportFeatureProvider.getSupportEligibleAccount(mActivity));
+        mAccount = mSupportFeatureProvider.getSupportEligibleAccount(mActivity);
         refreshData();
     }
 
@@ -155,6 +155,7 @@
     public void setAccount(Account account) {
         if (!Objects.equals(mAccount, account)) {
             mAccount = account;
+            mSupportFeatureProvider.refreshOperationRules();
             refreshData();
         }
     }

src/com/android/settings/overlay/SupportFeatureProvider.java

diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 4d8e3d6..45713e4 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -52,6 +52,11 @@
     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.
      */