PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash from battery saver switch" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-05-26 16:46:51 +00:00
committed by Android (Google) Code Review
parent fec38d0699 e4d0ed502d
commit 371aec1e92
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/dashboard/DashboardSummary.java
View File

@@ -87,7 +87,7 @@ public class DashboardSummary extends InstrumentedFragment
mSummaryLoader = new SummaryLoader(getActivity(), categories); mSummaryLoader = new SummaryLoader(getActivity(), categories);
setHasOptionsMenu(true); setHasOptionsMenu(true);
Context context = getContext(); Context context = getContext();
mConditionManager = ConditionManager.get(context); mConditionManager = ConditionManager.get(context, false);
mSuggestionParser = new SuggestionParser(context, mSuggestionParser = new SuggestionParser(context,
context.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering); context.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);
mSuggestionsChecks = new SuggestionsChecks(getContext()); mSuggestionsChecks = new SuggestionsChecks(getContext());

13
src/com/android/settings/dashboard/conditional/ConditionManager.java
View File

@@ -54,11 +54,16 @@ public class ConditionManager {
private final ArrayList<ConditionListener> mListeners = new ArrayList<>(); private final ArrayList<ConditionListener> mListeners = new ArrayList<>();
private ConditionManager(Context context) { private ConditionManager(Context context, boolean loadConditionsNow) {
mContext = context; mContext = context;
mConditions = new ArrayList<>(); mConditions = new ArrayList<>();
if (loadConditionsNow) {
ConditionLoader loader = new ConditionLoader();
loader.onPostExecute(loader.doInBackground());
} else {
new ConditionLoader().execute(); new ConditionLoader().execute();
} }
}
public void refreshAll() { public void refreshAll() {
final int N = mConditions.size(); final int N = mConditions.size();
@@ -241,8 +246,12 @@ public class ConditionManager {
} }
public static ConditionManager get(Context context) { public static ConditionManager get(Context context) {
return get(context, true);
}
public static ConditionManager get(Context context, boolean loadConditionsNow) {
if (sInstance == null) { if (sInstance == null) {
sInstance = new ConditionManager(context.getApplicationContext()); sInstance = new ConditionManager(context.getApplicationContext(), loadConditionsNow);
} }
return sInstance; return sInstance;
} }