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

Commit 29f73d68 authored by YK Hung's avatar YK Hung
Browse files

Exclude charging period when calculate the reattribute duration (5/5) 

Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: Icc9a475a71f189e72bf06f9a0b4c23380a90a603
parent af053aa3

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

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.util.SparseIntArray; 
import androidx.annotation.NonNull;



import com.android.settings.fuelgauge.batteryusage.BatteryDiffData;

import com.android.settings.fuelgauge.batteryusage.BatteryEvent;

import com.android.settings.fuelgauge.batteryusage.DetectRequestSourceType;

import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;

import com.android.settingslib.fuelgauge.Estimate;
@@ -166,5 +167,6 @@ public interface PowerUsageFeatureProvider { 
    boolean processBatteryReattributeData(

            @NonNull Context context,

            @NonNull Map<Long, BatteryDiffData> batteryDiffDataMap,

            @NonNull List<BatteryEvent> batteryEventList,

            final boolean isFromPeriodJob);

}

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

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


import static com.android.settings.Utils.SYSTEMUI_PACKAGE_NAME;



import android.annotation.Nullable;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -28,9 +27,11 @@ import android.util.ArraySet; 
import android.util.SparseIntArray;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.util.ArrayUtils;

import com.android.settings.fuelgauge.batteryusage.BatteryDiffData;

import com.android.settings.fuelgauge.batteryusage.BatteryEvent;

import com.android.settings.fuelgauge.batteryusage.DetectRequestSourceType;

import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;

import com.android.settingslib.fuelgauge.Estimate;
@@ -254,6 +255,7 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
    public boolean processBatteryReattributeData(

            @NonNull Context context,

            @NonNull Map<Long, BatteryDiffData> batteryDiffDataMap,

            @NonNull List<BatteryEvent> batteryEventList,

            final boolean isFromPeriodJob) {

        return false;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ public class DataProcessManager { 
                        FeatureFactory.getFeatureFactory()

                                .getPowerUsageFeatureProvider();

                featureProvider.processBatteryReattributeData(

                        mContext, batteryDiffDataMap, mIsFromPeriodJob);

                        mContext, batteryDiffDataMap, mBatteryEventList, mIsFromPeriodJob);



                Log.d(

                        TAG,