Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't wipe power stats data storage on a reboot.

Browse Source 
Bug: 174525864
Test: atest FrameworksServicesTests:PowerStatsServiceTest
Change-Id: I6ec9c36cded567895e2df111480f40d890a0601a
This commit is contained in:
Mat Bevilacqua
2020-12-01 13:08:24 -08:00
parent 578203143f
commit 9c6f63a6e3
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java
View File

@@ -177,8 +177,28 @@ public class PowerStatsDataStorage {
// filename, so any files that don't match the current version number can be deleted.
File[] files = mDataStorageDir.listFiles();
for (int i = 0; i < files.length; i++) {
if (!files[i].getName().matches(dataStorageFilename + "(.*)")) {
files[i].delete();
// Meter and model files are stored in the same directory.
//
// The format of filenames on disk is:
// log.powerstats.meter.version.timestamp
// log.powerstats.model.version.timestamp
//
// The format of dataStorageFilenames is:
// log.powerstats.meter.version
// log.powerstats.model.version
//
// A PowerStatsDataStorage object is created for meter and model data. Strip off
// the version and check that the current file we're checking starts with the stem
// (log.powerstats.meter or log.powerstats.model). If the stem matches and the
// version number is different, delete the old file.
int versionDot = dataStorageFilename.lastIndexOf('.');
String beforeVersionDot = dataStorageFilename.substring(0, versionDot);
// Check that the stems match.
if (files[i].getName().startsWith(beforeVersionDot)) {
// Check that the version number matches. If not, delete the old file.
if (!files[i].getName().startsWith(dataStorageFilename)) {
files[i].delete();
}
}
}