commit 15439d0c076dfe39b55efb2142a55dc42b20e459
author Chun-Wei Wang <wangchun@google.com> Fri May 29 21:26:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 29 21:26:20 2020 +0000
tree c96590a1a08c0fedd166fa97fff2a6470f20e62f
parent bc53ad2700a6fa2d708d4b97ba0b2f00c62a2a34
parent b87b05f2869eef7584f3f460cddf9aab348adf3c

Merge "Delete APK snapshots during restoration (3/n)" am: b87b05f286

Change-Id: I08d836616888dc5e7cb905ae3c42316e533a0bde

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 16daad9..43c4900 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -1064,6 +1064,7 @@
             res = error(rc, "Failed copying " + from_ce + " to " + to_ce);
             return res;
         }
+        delete_dir_contents_and_dir(from_ce, true /* ignore_if_missing */);
     }
 
     if (needs_de_rollback) {
@@ -1080,6 +1081,7 @@
             res = error(rc, "Failed copying " + from_de + " to " + to_de);
             return res;
         }
+        delete_dir_contents_and_dir(from_de, true /* ignore_if_missing */);
     }
 
     // Finally, restore the SELinux label on the app data.