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

Commit ecc72543 authored by JW Wang's avatar JW Wang Committed by Automerger Merge Worker
Browse files

Merge "Delete APK snapshots during restoration (3/n)" into rvc-dev am: 5bcc8f8a am: a514e13e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11644366

Change-Id: I724c3137d3c2ef7695fae70f089ea2876c507fb1
parents 313e5595 a514e13e

cmds/installd/InstalldNativeService.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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.