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

Commit 6958acdf authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Automerger Merge Worker
Browse files

Merge "Delete APK snapshots during restoration (3/n)" am: b87b05f2 am: 15439d0c am: 6280bc88 

Change-Id: I0ef9efe3c276cda7d2170d0cc32eddc59b2c338c
parents cb996c9a 6280bc88

cmds/installd/InstalldNativeService.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -1075,6 +1075,7 @@ binder::Status InstalldNativeService::restoreAppDataSnapshot( 
            res = error(rc, "Failed copying " + from_ce + " to " + to_ce);

            res = error(rc, "Failed copying " + from_ce + " to " + to_ce);

            return res;

            return res;

        }

        }

        delete_dir_contents_and_dir(from_ce, true /* ignore_if_missing */);

    }

    }





    if (needs_de_rollback) {

    if (needs_de_rollback) {
@@ -1091,6 +1092,7 @@ binder::Status InstalldNativeService::restoreAppDataSnapshot( 
            res = error(rc, "Failed copying " + from_de + " to " + to_de);

            res = error(rc, "Failed copying " + from_de + " to " + to_de);

            return res;

            return res;

        }

        }

        delete_dir_contents_and_dir(from_de, true /* ignore_if_missing */);

    }

    }





    // Finally, restore the SELinux label on the app data.

    // Finally, restore the SELinux label on the app data.