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

Commit c5c87b77 authored by Kuan Wang's avatar Kuan Wang
Browse files

Replaces getBatteryHistoryUri and getBatteryHistorySinceLastFullCharge 

with the new functions in DatabaseUtils.

Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I5f60cef80d1e9ba3f87ab6f84492463152a40276
parent df05a137

src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java

+0 −11
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.fuelgauge; 


import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.util.SparseIntArray;



import com.android.settings.fuelgauge.batteryusage.BatteryHistEntry;
@@ -154,16 +153,6 @@ public interface PowerUsageFeatureProvider { 
     */

    Map<Long, Map<String, BatteryHistEntry>> getBatteryHistory(Context context);



    /**

     * Returns battery history data since last full charge with corresponding timestamp key.

     */

    Map<Long, Map<String, BatteryHistEntry>> getBatteryHistorySinceLastFullCharge(Context context);



    /**

     * Returns {@link Uri} to monitor battery history data is update.

     */

    Uri getBatteryHistoryUri();



    /**

     * Returns {@link Set} for hidding applications background usage time.

     */

src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

+0 −12
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settings.fuelgauge; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.net.Uri;

import android.os.Process;

import android.util.ArraySet;

import android.util.SparseIntArray;
@@ -169,17 +168,6 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
        return null;

    }



    @Override

    public Map<Long, Map<String, BatteryHistEntry>> getBatteryHistorySinceLastFullCharge(

            Context context) {

        return null;

    }



    @Override

    public Uri getBatteryHistoryUri() {

        return null;

    }



    @Override

    public Set<CharSequence> getHideBackgroundUsageTimeSet(Context context) {

        return new ArraySet<>();

src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java

+2 −3
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.settingslib.utils.StringUtil; 
import com.android.settingslib.widget.FooterPreference;



import java.util.ArrayList;

import java.util.Calendar;

import java.util.HashMap;

import java.util.List;

import java.util.Map;
@@ -760,9 +761,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
    public static List<BatteryDiffEntry> getAppBatteryUsageData(Context context) {

        final long start = System.currentTimeMillis();

        final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =

                FeatureFactory.getFactory(context)

                        .getPowerUsageFeatureProvider(context)

                        .getBatteryHistorySinceLastFullCharge(context);

                DatabaseUtils.getHistoryMapSinceLastFullCharge(context, Calendar.getInstance());

        if (batteryHistoryMap == null || batteryHistoryMap.isEmpty()) {

            return null;

        }

src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryLoader.java

+2 −5
Original line number Diff line number Diff line
@@ -17,10 +17,9 @@ package com.android.settings.fuelgauge.batteryusage; 


import android.content.Context;



import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.utils.AsyncLoaderCompat;



import java.util.Calendar;

import java.util.Map;



/** Loader that can be used to load battery history information. */
@@ -41,8 +40,6 @@ public class BatteryHistoryLoader 


    @Override

    public Map<Long, Map<String, BatteryHistEntry>> loadInBackground() {

        final PowerUsageFeatureProvider powerUsageFeatureProvider =

                FeatureFactory.getFactory(mContext).getPowerUsageFeatureProvider(mContext);

        return powerUsageFeatureProvider.getBatteryHistorySinceLastFullCharge(mContext);

        return DatabaseUtils.getHistoryMapSinceLastFullCharge(mContext, Calendar.getInstance());

    }

}

src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        super.onPause();

        // Resets the flag to reload usage data in onResume() callback.

        mIsChartDataLoaded = false;

        final Uri uri = mPowerUsageFeatureProvider.getBatteryHistoryUri();

        final Uri uri = DatabaseUtils.BATTERY_CONTENT_URI;

        if (uri != null) {

            getContext().getContentResolver().unregisterContentObserver(mBatteryObserver);

        }
@@ -132,7 +132,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
    @Override

    public void onResume() {

        super.onResume();

        final Uri uri = mPowerUsageFeatureProvider.getBatteryHistoryUri();

        final Uri uri = DatabaseUtils.BATTERY_CONTENT_URI;

        if (uri != null) {

            getContext().getContentResolver().registerContentObserver(

                    uri, /*notifyForDescendants*/ true, mBatteryObserver);