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

Merge "Fix anomaly is not logged in non-debug mode." into main

Browse Source
This commit is contained in:
Zaiyue Xue
2024-03-04 07:55:18 +00:00
committed by Android (Google) Code Review
parent 66dacdf050 87ecb92e6e
commit a399c73ba0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,8 +274,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
if (!isResumed() || anomalyEventList == null) { if (!isResumed() || anomalyEventList == null) {
return; return;
} }
Log.d(TAG, "anomalyEventList = " + anomalyEventList); logPowerAnomalyEventList(anomalyEventList);
final Set<String> dismissedPowerAnomalyKeys = final Set<String> dismissedPowerAnomalyKeys =
DatabaseUtils.getDismissedPowerAnomalyKeys(getContext()); DatabaseUtils.getDismissedPowerAnomalyKeys(getContext());
Log.d(TAG, "dismissedPowerAnomalyKeys = " + dismissedPowerAnomalyKeys); Log.d(TAG, "dismissedPowerAnomalyKeys = " + dismissedPowerAnomalyKeys);
@@ -429,10 +428,19 @@ public class PowerUsageAdvanced extends PowerUsageBase {
.filter(predicate) .filter(predicate)
.max(Comparator.comparing(PowerAnomalyEvent::getScore)) .max(Comparator.comparing(PowerAnomalyEvent::getScore))
.orElse(null); .orElse(null);
Log.d(TAG, "filterAnomalyEvent = " + filterAnomalyEvent); Log.d(TAG, "filterAnomalyEvent = "
+ (filterAnomalyEvent == null ? null : filterAnomalyEvent.getEventId()));
return filterAnomalyEvent; return filterAnomalyEvent;
} }
private static void logPowerAnomalyEventList(PowerAnomalyEventList anomalyEventList) {
final StringBuilder stringBuilder = new StringBuilder();
for (PowerAnomalyEvent anomalyEvent : anomalyEventList.getPowerAnomalyEventsList()) {
stringBuilder.append(anomalyEvent.getEventId()).append(", ");
}
Log.d(TAG, "anomalyEventList = [" + stringBuilder + "]");
}
private static BatteryDiffData getAllBatteryDiffData( private static BatteryDiffData getAllBatteryDiffData(
Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap) { Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap) {
return batteryUsageMap == null return batteryUsageMap == null