Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3b9c3dd authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: 371aec1e

* commit '371aec1e':
  Fix crash from battery saver switch

Change-Id: I0416b92dbc9b18a97c9d6d0617cba636e310690b
parents d2ecbf5c 371aec1e

src/com/android/settings/dashboard/DashboardSummary.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class DashboardSummary extends InstrumentedFragment 
                ((SettingsActivity) getActivity()).getDashboardCategories();

        mSummaryLoader = new SummaryLoader(getActivity(), categories);

        Context context = getContext();

        mConditionManager = ConditionManager.get(context);

        mConditionManager = ConditionManager.get(context, false);

        mSuggestionParser = new SuggestionParser(context,

                context.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);

        mSuggestionsChecks = new SuggestionsChecks(getContext());

src/com/android/settings/dashboard/conditional/ConditionManager.java

+12 −3
Original line number Diff line number Diff line
@@ -54,11 +54,16 @@ public class ConditionManager { 


    private final ArrayList<ConditionListener> mListeners = new ArrayList<>();



    private ConditionManager(Context context) {

    private ConditionManager(Context context, boolean loadConditionsNow) {

        mContext = context;

        mConditions = new ArrayList<>();

        if (loadConditionsNow) {

            ConditionLoader loader = new ConditionLoader();

            loader.onPostExecute(loader.doInBackground());

        } else {

            new ConditionLoader().execute();

        }

    }



    public void refreshAll() {

        final int N = mConditions.size();
@@ -241,8 +246,12 @@ public class ConditionManager { 
    }



    public static ConditionManager get(Context context) {

        return get(context, true);

    }



    public static ConditionManager get(Context context, boolean loadConditionsNow) {

        if (sInstance == null) {

            sInstance = new ConditionManager(context.getApplicationContext());

            sInstance = new ConditionManager(context.getApplicationContext(), loadConditionsNow);

        }

        return sInstance;

    }