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

Commit 36ad6394 authored by Varun Shah's avatar Varun Shah
Browse files

Update SyncStorageEngine#DELETE_LEGACY_PARCEL_FILES. 

Delete the parcel files on a successful upgrade to proto. This was
kept as true such that a revert to the parcel files would be possible
if needed.

Bug: 143656271
Test: manual: files are deleted on upgrade.
Change-Id: I98019e2aef3e4413a67c714691ebdc0973a8a665
parent 6d03d973

services/core/java/com/android/server/content/SyncStorageEngine.java

+3 −4
Original line number Diff line number Diff line
@@ -472,8 +472,7 @@ public class SyncStorageEngine { 


    private int mSyncRandomOffset;



    // STOPSHIP: b/143656271 this should be true on launch

    private static final boolean DELETE_LEGACY_PARCEL_FILES = false;

    private static final boolean DELETE_LEGACY_PARCEL_FILES = true;

    private static final String LEGACY_STATUS_FILE_NAME = "status.bin";

    private static final String LEGACY_STATISTICS_FILE_NAME = "stats.bin";
@@ -2076,7 +2075,7 @@ public class SyncStorageEngine { 
        }



        // if upgrade to proto was successful, delete parcel file

        if (DELETE_LEGACY_PARCEL_FILES && mStatusFile.exists()) {

        if (DELETE_LEGACY_PARCEL_FILES && parcelStatus.exists() && mStatusFile.exists()) {

            parcelStatus.delete();

        }

    }
@@ -2475,7 +2474,7 @@ public class SyncStorageEngine { 
        }



        // if upgrade to proto was successful, delete parcel file

        if (DELETE_LEGACY_PARCEL_FILES && mStatisticsFile.exists()) {

        if (DELETE_LEGACY_PARCEL_FILES && parcelStats.exists() && mStatisticsFile.exists()) {

            parcelStats.delete();

        }

    }