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

Commit af07eba3 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Remove flag... 

Merge "Remove flag com.android.server.power.optimization.extended_battery_history_compression_enabled" into main
parents ea86a621 9b7fc8c6

services/core/java/com/android/server/am/BatteryStatsService.java

+0 −2
Original line number Diff line number Diff line
@@ -467,8 +467,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
    }



    public void systemServicesReady() {

        mStats.setBatteryHistoryCompressionEnabled(

                Flags.extendedBatteryHistoryCompressionEnabled());

        mStats.saveBatteryUsageStatsOnNewSession(mBatteryUsageStatsProvider, mPowerStatsStore,

                true);

services/core/java/com/android/server/power/stats/BatteryHistoryDirectory.java

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class BatteryHistoryDirectory implements BatteryStatsHistory.BatteryHisto 
    private final ReentrantLock mLock = new ReentrantLock();

    private final Compressor mCompressor;

    private boolean mWaitForDirectoryLock = false;

    private boolean mFileCompressionEnabled;

    private boolean mFileCompressionEnabled = true;



    public BatteryHistoryDirectory(@NonNull File directory, int maxHistorySize) {

        this(directory, maxHistorySize, DEFAULT_COMPRESSOR);
@@ -131,6 +131,7 @@ public class BatteryHistoryDirectory implements BatteryStatsHistory.BatteryHisto 
        mCompressor = compressor;

    }



    @VisibleForTesting

    public void setFileCompressionEnabled(boolean enabled) {

        mFileCompressionEnabled = enabled;

    }

services/core/java/com/android/server/power/stats/BatteryStatsImpl.java

+0 −7
Original line number Diff line number Diff line
@@ -11701,13 +11701,6 @@ public class BatteryStatsImpl extends BatteryStats { 
        mAccumulateBatteryUsageStats = accumulateBatteryUsageStats;

    }













    /**













     * Enables or disables battery history file compression.













     */













    public void setBatteryHistoryCompressionEnabled(boolean enabled) {













        mBatteryHistoryDirectory.setFileCompressionEnabled(enabled);













    }



























    @GuardedBy("this")















    public void resetAllStatsAndHistoryLocked(int reason) {















        final long mSecUptime = mClock.uptimeMillis();

































services/core/java/com/android/server/power/stats/flags.aconfig



+0
−10




























Original line number
Diff line number
Diff line








@@ -38,13 +38,3 @@ flag {













    bug: "364350206"















    is_fixed_read_only: true















}


























flag {













    name: "extended_battery_history_compression_enabled"













    namespace: "backstage_power"













    description: "Compress each battery history chunk on disk"













    bug: "381937912"













    metadata {













        purpose: PURPOSE_BUGFIX













    }













}
























services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java



+0
−6




























Original line number
Diff line number
Diff line








@@ -42,7 +42,6 @@ import android.os.Handler;













import android.os.Parcel;















import android.os.Process;















import android.os.UidBatteryConsumer;













import android.platform.test.annotations.EnableFlags;















import android.platform.test.flag.junit.SetFlagsRule;















import android.platform.test.ravenwood.RavenwoodRule;

























@@ -53,7 +52,6 @@ import androidx.test.runner.AndroidJUnit4;













import com.android.internal.os.BatteryStatsHistoryIterator;















import com.android.internal.os.MonotonicClock;















import com.android.internal.os.PowerProfile;













import com.android.server.power.optimization.Flags;















import com.android.server.power.stats.processor.MultiStatePowerAttributor;































import org.junit.Before;










@@ -915,14 +913,10 @@ public class BatteryUsageStatsProviderTest {













    }































    @Test













    @EnableFlags({













            Flags.FLAG_EXTENDED_BATTERY_HISTORY_COMPRESSION_ENABLED













    })















    public void testIncludeSubsetOfHistory() throws IOException {















        MockBatteryStatsImpl batteryStats = mStatsRule.getBatteryStats();















        BatteryHistoryDirectory store =















                (BatteryHistoryDirectory) batteryStats.getHistory().getBatteryHistoryStore();













        store.setFileCompressionEnabled(true);















        // Make history fragment size predictable. Without this protection, holding the history















        // directory lock in the background would prevent new fragments from being created.















        store.makeDirectoryLockUnconditional();