Add whether app optimization mode mutable in BatteryUsageDiff proto.

Bug: 350657779
Test: atest ConvertUtilsTest
Flag: EXEMPT bug fix
Change-Id: I80a5e6513e1bee88f85caeed7661b10204df8a51
This commit is contained in:
mxyyiyi
2024-07-30 17:59:57 +08:00
parent 3a8ce3f970
commit 59e5dc720a
4 changed files with 33 additions and 16 deletions

View File

@@ -35,6 +35,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.util.Pair;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity;
@@ -542,9 +543,11 @@ public final class ConvertUtils {
}
// Log the battery optimization mode of AppEntry while converting to batteryUsageSlot.
if (optimizationModeCache != null && !batteryDiffEntry.isSystemEntry()) {
builder.setAppOptimizationMode(
optimizationModeCache.getBatteryOptimizeMode(
(int) batteryDiffEntry.mUid, batteryDiffEntry.getPackageName()));
final Pair<BatteryOptimizationMode, Boolean> batteryOptimizationModeInfo =
optimizationModeCache.getBatteryOptimizeModeInfo(
(int) batteryDiffEntry.mUid, batteryDiffEntry.getPackageName());
builder.setAppOptimizationMode(batteryOptimizationModeInfo.first)
.setIsAppOptimizationModeMutable(batteryOptimizationModeInfo.second);
}
return builder.build();
}