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

Commit 62743d73 authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Use assignment instead of reset for profile unique_fd" am: fd695a61 am: 32d41fec 

am: 621bc308

Change-Id: I7635c11b945098d39ae6d557b3df27854ec19d42
parents c9f888b8 621bc308

cmds/installd/dexopt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static unique_fd open_reference_profile(uid_t uid, const std::string& pkgname, b 
static void open_profile_files(uid_t uid, const std::string& pkgname,

            /*out*/ std::vector<unique_fd>* profiles_fd, /*out*/ unique_fd* reference_profile_fd) {

    // Open the reference profile in read-write mode as profman might need to save the merge.

    reference_profile_fd->reset(open_reference_profile(uid, pkgname, /*read_write*/ true));

    *reference_profile_fd = open_reference_profile(uid, pkgname, /*read_write*/ true);

    if (reference_profile_fd->get() < 0) {

        // We can't access the reference profile file.

        return;