From fda19ecdd6df8f43d3368781a633792723fb9965 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Mon, 18 May 2020 16:54:08 +0800 Subject: Delete APK snapshots during restoration (3/n) The snapshots are no longer needed after restore is done. We do this in keeping with the fact that apk/apex code data is deleted immediately after the rollback is committed. See go/rollbackmanager-snapshot-deletion for more details. Bug: 151805360 Test: N/A. Will be added in the next CL. Change-Id: I5a7540aa08922c4b0c617c9cb37e1bec2ff23fc1 --- cmds/installd/InstalldNativeService.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index c0fb0f89a6..3d4db276ed 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -1064,6 +1064,7 @@ binder::Status InstalldNativeService::restoreAppDataSnapshot( 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 @@ binder::Status InstalldNativeService::restoreAppDataSnapshot( 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. -- cgit v1.2.3-59-g8ed1b