From 9b9b1aa0626b01a4836a2c1144d5830a2318235b Mon Sep 17 00:00:00 2001 From: JW Wang Date: Mon, 18 May 2020 16:54:08 +0800 Subject: [PATCH] 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. Merged-In: I5a7540aa08922c4b0c617c9cb37e1bec2ff23fc1 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 7d1c1ad37d..b9c1addf89 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -1074,6 +1074,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) { @@ -1090,6 +1091,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.