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

This commit is contained in:
Zaiyue Xue
2024-03-04 07:55:18 +00:00
committed by Android (Google) Code Review

View File

@@ -274,8 +274,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
if (!isResumed() || anomalyEventList == null) {
return;
}
Log.d(TAG, "anomalyEventList = " + anomalyEventList);
logPowerAnomalyEventList(anomalyEventList);
final Set<String> dismissedPowerAnomalyKeys =
DatabaseUtils.getDismissedPowerAnomalyKeys(getContext());
Log.d(TAG, "dismissedPowerAnomalyKeys = " + dismissedPowerAnomalyKeys);
@@ -429,10 +428,19 @@ public class PowerUsageAdvanced extends PowerUsageBase {
.filter(predicate)
.max(Comparator.comparing(PowerAnomalyEvent::getScore))
.orElse(null);
Log.d(TAG, "filterAnomalyEvent = " + filterAnomalyEvent);
Log.d(TAG, "filterAnomalyEvent = "
+ (filterAnomalyEvent == null ? null : filterAnomalyEvent.getEventId()));
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(
Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap) {
return batteryUsageMap == null