diff options
| author | 2022-05-27 19:47:11 +0000 | |
|---|---|---|
| committer | 2022-05-27 19:47:11 +0000 | |
| commit | ada68d3eae15235adb9a4eecb09c9838d1f45c8a (patch) | |
| tree | d6d8b468d97c1411ce2bba5e8c3bf330ac0d7e00 | |
| parent | fcfda777aead9d4461c78d17e945ee2d1a57216d (diff) | |
| parent | 295eed4fcb6cc5f1d0a2d50284f239bd9134e75b (diff) | |
Merge "Fix directory comparison in tryMountDataMirror" am: 156e28ff02 am: 295eed4fcb
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2107188
Change-Id: I9f58f03a99a0cea9bc9f5ab266ee5bad4a029dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/installd/InstalldNativeService.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index 4504766e96..1d7dd5f51e 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -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(); } |