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

Commit d04079c8 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Fix directory comparison in tryMountDataMirror" am: 156e28ff am:... 

Merge "Fix directory comparison in tryMountDataMirror" am: 156e28ff am: 295eed4f am: ada68d3e am: a3589693 am: 24da4232

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



Change-Id: I5d13e1c0ecea1fd3cb8d9c30edfeadb988f2ad32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38272116 24da4232

cmds/installd/InstalldNativeService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -3571,10 +3571,10 @@ binder::Status InstalldNativeService::tryMountDataMirror( 
        return error("Failed to stat " + mirrorVolCePath);

    }



    if (mirrorCeStat.st_ino == ceStat.st_ino) {

    if (mirrorCeStat.st_ino == ceStat.st_ino && mirrorCeStat.st_dev == ceStat.st_dev) {

        // As it's being called by prepareUserStorage, it can be called multiple times.

        // Hence, we if we mount it already, we should skip it.

        LOG(WARNING) << "CE dir is mounted already: " + cePath;

        LOG(INFO) << "CE dir is mounted already: " + cePath;

        return ok();

    }