From a0ebd1a9f0a628aaffcde9b9fcc7fb16c6f85f26 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 25 Jul 2016 12:55:36 -0700 Subject: [PATCH] Refresh state after loading conditions from xml. Fixes: 30330909 When start Settings, conditions is loaded from a xml with potentially stale state. ConditionLoader needs to refresh states after reading xml to make sure they are up to date. Change-Id: Ice1b8bacb0486c5dd230b83670c1494710d1c061 --- .../settings/dashboard/conditional/ConditionManager.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/dashboard/conditional/ConditionManager.java b/src/com/android/settings/dashboard/conditional/ConditionManager.java index d6b34cb5e07..691821a776f 100644 --- a/src/com/android/settings/dashboard/conditional/ConditionManager.java +++ b/src/com/android/settings/dashboard/conditional/ConditionManager.java @@ -20,6 +20,7 @@ import android.os.AsyncTask; import android.os.PersistableBundle; import android.util.Log; import android.util.Xml; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; @@ -241,10 +242,7 @@ public class ConditionManager { protected void onPostExecute(ArrayList conditions) { mConditions.clear(); mConditions.addAll(conditions); - final int N = mListeners.size(); - for (int i = 0; i < N; i++) { - mListeners.get(i).onConditionsChanged(); - } + refreshAll(); } }