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

Merge "Call detect anomaly in period job only when there is new battery usage data." into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-20 09:56:12 +00:00
committed by Android (Google) Code Review
parent 4b453bad21 c3cf254c7d
commit c3ff29b124
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetector.java
View File

@@ -23,8 +23,6 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
import java.util.concurrent.TimeUnit;
/** /**
* Detect whether the battery is too low * Detect whether the battery is too low
*/ */
@@ -46,9 +44,7 @@ public class LowBatteryDetector implements BatteryTipDetector {
@Override @Override
public BatteryTip detect() { public BatteryTip detect() {
final boolean lowBattery = mBatteryInfo.batteryLevel <= mWarningLevel final boolean lowBattery = mBatteryInfo.batteryLevel <= mWarningLevel;
|| (mBatteryInfo.discharging && mBatteryInfo.remainingTimeUs != 0
&& mBatteryInfo.remainingTimeUs < TimeUnit.HOURS.toMicros(mPolicy.lowBatteryHour));
final boolean lowBatteryEnabled = mPolicy.lowBatteryEnabled && !mIsPowerSaveMode; final boolean lowBatteryEnabled = mPolicy.lowBatteryEnabled && !mIsPowerSaveMode;
final boolean dischargingLowBatteryState = final boolean dischargingLowBatteryState =
mPolicy.testLowBatteryTip || (mBatteryInfo.discharging && lowBattery); mPolicy.testLowBatteryTip || (mBatteryInfo.discharging && lowBattery);

14
src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
View File

@@ -116,8 +116,16 @@ public final class BatteryUsageDataLoader {
final Handler handler = new Handler(Looper.getMainLooper()); final Handler handler = new Handler(Looper.getMainLooper());
final BatteryLevelData batteryLevelData = DataProcessManager.getBatteryLevelData( final BatteryLevelData batteryLevelData = DataProcessManager.getBatteryLevelData(
context, handler, /*isFromPeriodJob=*/ true, context, handler, /*isFromPeriodJob=*/ true,
batteryDiffDataMap -> DatabaseUtils.sendBatteryUsageSlotData(context, batteryDiffDataMap -> {
ConvertUtils.convertToBatteryUsageSlotList(batteryDiffDataMap))); DatabaseUtils.sendBatteryUsageSlotData(context,
ConvertUtils.convertToBatteryUsageSlotList(batteryDiffDataMap));
if (batteryDiffDataMap.values().stream().anyMatch(data ->
(!data.getAppDiffEntryList().isEmpty()
|| !data.getSystemDiffEntryList().isEmpty()))) {
FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider()
.detectSettingsAnomaly(context, /* displayDrain= */ 0);
}
});
if (batteryLevelData == null) { if (batteryLevelData == null) {
Log.d(TAG, "preprocessBatteryUsageSlots() no new battery usage data."); Log.d(TAG, "preprocessBatteryUsageSlots() no new battery usage data.");
return; return;
@@ -139,8 +147,6 @@ public final class BatteryUsageDataLoader {
// No app usage data or battery diff data at this time. // No app usage data or battery diff data at this time.
loadAppUsageData(context); loadAppUsageData(context);
preprocessBatteryUsageSlots(context); preprocessBatteryUsageSlots(context);
FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider()
.detectSettingsAnomaly(context, /* displayDrain= */ 0);
} }
Log.d(TAG, String.format( Log.d(TAG, String.format(
"loadUsageDataSafely() in %d/ms", System.currentTimeMillis() - start)); "loadUsageDataSafely() in %d/ms", System.currentTimeMillis() - start));

11
tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
View File

@@ -53,7 +53,6 @@ public class LowBatteryDetectorTest {
mPolicy = spy(new BatteryTipPolicy(RuntimeEnvironment.application)); mPolicy = spy(new BatteryTipPolicy(RuntimeEnvironment.application));
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", true); ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", true);
ReflectionHelpers.setField(mPolicy, "lowBatteryHour", 3);
mBatteryInfo.discharging = true; mBatteryInfo.discharging = true;
mLowBatteryDetector = new LowBatteryDetector(mContext, mPolicy, mBatteryInfo, mLowBatteryDetector = new LowBatteryDetector(mContext, mPolicy, mBatteryInfo,
@@ -78,13 +77,9 @@ public class LowBatteryDetectorTest {
@Test @Test
public void testDetect_lowBattery_tipNew() { public void testDetect_lowBattery_tipNew() {
mBatteryInfo.batteryLevel = 3; mBatteryInfo.batteryLevel = 20;
mBatteryInfo.remainingTimeUs = TimeUnit.DAYS.toMillis(1); mBatteryInfo.remainingTimeUs = TimeUnit.DAYS.toMillis(1);
assertThat(mLowBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW); assertThat(mLowBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW);
mBatteryInfo.batteryLevel = 50;
mBatteryInfo.remainingTimeUs = TimeUnit.MINUTES.toMillis(1);
assertThat(mLowBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW);
} }
@Test @Test
@@ -104,9 +99,9 @@ public class LowBatteryDetectorTest {
} }
@Test @Test
public void testDetect_timeEstimationZero_tipInvisible() { public void testDetect_lowTimeEstimation_tipInvisible() {
mBatteryInfo.batteryLevel = 50; mBatteryInfo.batteryLevel = 50;
mBatteryInfo.remainingTimeUs = 0; mBatteryInfo.remainingTimeUs = TimeUnit.MINUTES.toMillis(1);
assertThat(mLowBatteryDetector.detect().isVisible()).isFalse(); assertThat(mLowBatteryDetector.detect().isVisible()).isFalse();
} }