diff options
author | 2025-03-21 20:23:33 -0700 | |
---|---|---|
committer | 2025-03-21 20:23:33 -0700 | |
commit | 0383e3c5614e41e6eb8a9937e7fcb559f098759d (patch) | |
tree | 5b37ab5cc98448a683f84dfe10d13303d908a6b4 | |
parent | ecdaeb23d01283719566b87da978d87d9b2c2156 (diff) | |
parent | d4ccc7f31b8bec0362e5a022ef20982af563b0b7 (diff) |
Snap for 13256841 from d4ccc7f31b8bec0362e5a022ef20982af563b0b7 to 25Q2-release
Change-Id: I9422cf15102ca3c7c4d76fccf51ce9b314b32e16
-rw-r--r-- | jni/FuseDaemon.cpp | 1 | ||||
-rw-r--r-- | pdf/framework/libs/pdfClient/Android.bp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jni/FuseDaemon.cpp b/jni/FuseDaemon.cpp index 816fbcff7..d22758bba 100644 --- a/jni/FuseDaemon.cpp +++ b/jni/FuseDaemon.cpp @@ -2651,6 +2651,7 @@ std::unique_ptr<FdAccessResult> FuseDaemon::CheckFdAccess(int fd, uid_t uid) con return std::make_unique<FdAccessResult>(string(), false); } + std::lock_guard<std::recursive_mutex> guard(fuse->lock); const node* node = node::LookupInode(fuse->root, ino); if (!node) { PLOG(DEBUG) << "CheckFdAccess no node found with given ino"; diff --git a/pdf/framework/libs/pdfClient/Android.bp b/pdf/framework/libs/pdfClient/Android.bp index dad336fff..95272f3c5 100644 --- a/pdf/framework/libs/pdfClient/Android.bp +++ b/pdf/framework/libs/pdfClient/Android.bp @@ -108,7 +108,7 @@ cc_test { static_libs: [ "libbase_ndk", - "libpdfium_static", + "libpdfium_static_android_r_compatible", ], shared_libs: [ @@ -116,7 +116,6 @@ cc_test { "libjnigraphics", "libdl", "libft2", - "libicu", "libjpeg", "libz", ], |