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

Commit a1cbc87c authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Remove flag com.android.server.power.optimization.accumulate_battery_usage_stats

Bug: 409605895
Test: presubmit
Flag: EXEMPT removing com.android.server.power.optimization.accumulate_battery_usage_stats
Change-Id: I49944a09f30623b1328f6a67c49faf581f4cfc42
parent f8595c60
Loading
Loading
Loading
Loading
+6 −15
Original line number Diff line number Diff line
@@ -469,8 +469,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub
    public void systemServicesReady() {
        mStats.setBatteryHistoryCompressionEnabled(
                Flags.extendedBatteryHistoryCompressionEnabled());
        mStats.saveBatteryUsageStatsOnReset(mBatteryUsageStatsProvider, mPowerStatsStore,
                isBatteryUsageStatsAccumulationSupported());
        mStats.saveBatteryUsageStatsOnNewSession(mBatteryUsageStatsProvider, mPowerStatsStore,
                true);
        mStats.resetBatteryHistoryOnNewSession(
                !Flags.extendedBatteryHistoryContinuousCollectionEnabled());

@@ -564,10 +564,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
        mSystemReady.open();
    }

    private static boolean isBatteryUsageStatsAccumulationSupported() {
        return Flags.accumulateBatteryUsageStats();
    }

    /**
     * Notifies BatteryStatsService that the system server is ready.
     */
@@ -1046,12 +1042,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub
                            .setMaxStatsAgeMs(0)
                            .includeProcessStateData()
                            .includeVirtualUids()
                            .setMinConsumedPowerThreshold(minConsumedPowerThreshold);

                    if (isBatteryUsageStatsAccumulationSupported()) {
                        query.accumulated()
                            .setMinConsumedPowerThreshold(minConsumedPowerThreshold)
                            .accumulated()
                            .setMaxStatsAgeMs(BATTERY_USAGE_STATS_PER_UID_MAX_STATS_AGE);
                    }

                    bus = getBatteryUsageStats(List.of(query.build())).get(0);
                    final int pullResult =
@@ -2959,9 +2952,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
        pw.println("     --proto: output as a binary protobuffer");
        pw.println("     --model power-profile: use the power profile model"
                + " even if measured energy is available");
        if (isBatteryUsageStatsAccumulationSupported()) {
        pw.println("     --accumulated: continuously accumulated since setup or reset-all");
        }
        pw.println("  --sample: collect and dump a sample of stats for debugging purpose");
        pw.println("  --sync: wait for delayed processing to finish (for use in tests)");
        pw.println("  <package.name>: optional name of package to filter output by.");
+9 −9
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ public class BatteryStatsImpl extends BatteryStats {
        }
    }
    private boolean mSaveBatteryUsageStatsOnReset;
    private boolean mSaveBatteryUsageStatsOnNewSession;
    private boolean mResetBatteryHistoryOnNewSession;
    private boolean mAccumulateBatteryUsageStats;
    private BatteryUsageStatsProvider mBatteryUsageStatsProvider;
@@ -11690,13 +11690,13 @@ public class BatteryStatsImpl extends BatteryStats {
    /**
     * Associates the BatteryStatsImpl object with a BatteryUsageStatsProvider and PowerStatsStore
     * to allow for a snapshot of battery usage stats to be taken and stored just before battery
     * reset.
     * starting a new history buffer.
     */
    public void saveBatteryUsageStatsOnReset(
    public void saveBatteryUsageStatsOnNewSession(
            @NonNull BatteryUsageStatsProvider batteryUsageStatsProvider,
            @NonNull PowerStatsStore powerStatsStore,
            boolean accumulateBatteryUsageStats) {
        mSaveBatteryUsageStatsOnReset = true;
        mSaveBatteryUsageStatsOnNewSession = true;
        mBatteryUsageStatsProvider = batteryUsageStatsProvider;
        mPowerStatsStore = powerStatsStore;
        mAccumulateBatteryUsageStats = accumulateBatteryUsageStats;
@@ -11762,7 +11762,7 @@ public class BatteryStatsImpl extends BatteryStats {
        }
        mHandler.post(()-> {
            saveBatteryUsageStatsOnReset();
            saveBatteryUsageStatsOnNewSession();
            synchronized (BatteryStatsImpl.this) {
                resetAllStatsLocked(mClock.uptimeMillis(), mClock.elapsedRealtime(), reason);
            }
@@ -11928,8 +11928,8 @@ public class BatteryStatsImpl extends BatteryStats {
        mHandler.sendEmptyMessage(MSG_REPORT_RESET_STATS);
    }
    private void saveBatteryUsageStatsOnReset() {
        if (!mSaveBatteryUsageStatsOnReset) {
    private void saveBatteryUsageStatsOnNewSession() {
        if (!mSaveBatteryUsageStatsOnNewSession) {
            return;
        }
@@ -15090,7 +15090,7 @@ public class BatteryStatsImpl extends BatteryStats {
                    &&  !mEnergyConsumerStatsConfig.isCompatible(config)) {
                // Supported power buckets changed since last boot.
                // Save accumulated battery usage stats before resetting
                saveBatteryUsageStatsOnReset();
                saveBatteryUsageStatsOnNewSession();
                // Existing data is no longer reliable.
                resetAllStatsLocked(SystemClock.uptimeMillis(), SystemClock.elapsedRealtime(),
                        RESET_REASON_ENERGY_CONSUMER_BUCKETS_CHANGE);
@@ -15102,7 +15102,7 @@ public class BatteryStatsImpl extends BatteryStats {
            if (mEnergyConsumerStatsConfig != null) {
                // EnergyConsumer no longer supported
                // Save accumulated battery usage stats before resetting
                saveBatteryUsageStatsOnReset();
                saveBatteryUsageStatsOnNewSession();
                // Wipe out the current battery session data.
                resetAllStatsLocked(SystemClock.uptimeMillis(), SystemClock.elapsedRealtime(),
                        RESET_REASON_ENERGY_CONSUMER_BUCKETS_CHANGE);
+0 −10
Original line number Diff line number Diff line
@@ -39,16 +39,6 @@ flag {
    is_fixed_read_only: true
}

flag {
    name: "accumulate_battery_usage_stats"
    namespace: "backstage_power"
    description: "Add support for monotonically accumulated BatteryUsageStats"
    bug: "345022340"
    metadata {
        purpose: PURPOSE_BUGFIX
    }
}

flag {
    name: "extended_battery_history_continuous_collection_enabled"
    namespace: "backstage_power"
+1 −1
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ public class BatteryStatsImplTest {

        assertThat(mPowerStatsStore.getTableOfContents()).isEmpty();

        mBatteryStatsImpl.saveBatteryUsageStatsOnReset(mBatteryUsageStatsProvider,
        mBatteryStatsImpl.saveBatteryUsageStatsOnNewSession(mBatteryUsageStatsProvider,
                mPowerStatsStore, /* accumulateBatteryUsageStats */ false);

        synchronized (mBatteryStatsImpl) {
+2 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ public class BatteryUsageStatsProviderTest {

        BatteryUsageStatsProvider provider = createBatteryUsageStatsProvider(0);

        batteryStats.saveBatteryUsageStatsOnReset(provider, mPowerStatsStore,
        batteryStats.saveBatteryUsageStatsOnNewSession(provider, mPowerStatsStore,
                /* accumulateBatteryUsageStats */ false);
        batteryStats.startNewSession(BatteryStatsImpl.RESET_REASON_ADB_COMMAND);
        mStatsRule.waitForBackgroundThread();
@@ -849,7 +849,7 @@ public class BatteryUsageStatsProviderTest {
            return null;
        }).when(powerStatsStore).storeBatteryUsageStatsAsync(anyLong(), any());

        mStatsRule.getBatteryStats().saveBatteryUsageStatsOnReset(provider, powerStatsStore,
        mStatsRule.getBatteryStats().saveBatteryUsageStatsOnNewSession(provider, powerStatsStore,
                /* accumulateBatteryUsageStats */ false);

        // Make an incompatible change of supported energy components.  This will trigger