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

Commit 76c7ab46 authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Terminate snapuserd daemon after merge completion" am:... 

Merge "libsnapshot: Terminate snapuserd daemon after merge completion" am: 91ff0285 am: 2b04882f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1948360

Change-Id: I2c8c5ee235d63903086ebb459c2a15cfa6bf9c0d
parents 19011147 2b04882f

fs_mgr/libsnapshot/snapshot.cpp

+9 −1
Original line number Diff line number Diff line
@@ -1467,6 +1467,14 @@ void SnapshotManager::AcknowledgeMergeSuccess(LockedFile* lock) { 
    }



    RemoveAllUpdateState(lock);



    if (UpdateUsesUserSnapshots(lock) && !device()->IsTestDevice()) {

        if (snapuserd_client_) {

            snapuserd_client_->DetachSnapuserd();

            snapuserd_client_->CloseConnection();

            snapuserd_client_ = nullptr;

        }

    }

}



void SnapshotManager::AcknowledgeMergeFailure(MergeFailureCode failure_code) {
@@ -3200,7 +3208,7 @@ Return SnapshotManager::CreateUpdateSnapshots(const DeltaArchiveManifest& manife 


            // Terminate stale daemon if any

            std::unique_ptr<SnapuserdClient> snapuserd_client =

                    SnapuserdClient::Connect(kSnapuserdSocket, 10s);

                    SnapuserdClient::Connect(kSnapuserdSocket, 5s);

            if (snapuserd_client) {

                snapuserd_client->DetachSnapuserd();

                snapuserd_client->CloseConnection();