Merge "Stop deleting reserve copy file for permission and role" into main

2 files changed, 2 insertions, 6 deletions

diff --git a/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java b/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java
index f3ba5aaef..4c8eb1df1 100644
--- a/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java
+++ b/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java
@@ -214,9 +214,6 @@ public class RuntimePermissionsPersistenceImpl implements RuntimePermissionsPers
     @Override
     public void writeForUser(@NonNull RuntimePermissionsState runtimePermissions,
             @NonNull UserHandle user) {
-        File reserveFile = getReserveCopyFile(user);
-        reserveFile.delete();
-
         File file = getFile(user);
         AtomicFile atomicFile = new AtomicFile(file);
         FileOutputStream outputStream = null;
@@ -240,6 +237,7 @@ public class RuntimePermissionsPersistenceImpl implements RuntimePermissionsPers
             IoUtils.closeQuietly(outputStream);
         }
 
+        File reserveFile = getReserveCopyFile(user);
         try (FileInputStream in = new FileInputStream(file);
              FileOutputStream out = new FileOutputStream(reserveFile)) {
             FileUtils.copy(in, out);
diff --git a/service/java/com/android/role/persistence/RolesPersistenceImpl.java b/service/java/com/android/role/persistence/RolesPersistenceImpl.java
index 242f7315f..f308304b5 100644
--- a/service/java/com/android/role/persistence/RolesPersistenceImpl.java
+++ b/service/java/com/android/role/persistence/RolesPersistenceImpl.java
@@ -190,9 +190,6 @@ public class RolesPersistenceImpl implements RolesPersistence {
 
     @Override
     public void writeForUser(@NonNull RolesState roles, @NonNull UserHandle user) {
-        File reserveFile = getReserveCopyFile(user);
-        reserveFile.delete();
-
         File file = getFile(user);
         AtomicFile atomicFile = new AtomicFile(file);
         FileOutputStream outputStream = null;
@@ -217,6 +214,7 @@ public class RolesPersistenceImpl implements RolesPersistence {
             IoUtils.closeQuietly(outputStream);
         }
 
+        File reserveFile = getReserveCopyFile(user);
         try (FileInputStream in = new FileInputStream(file);
              FileOutputStream out = new FileOutputStream(reserveFile)) {
             FileUtils.copy(in, out);