Merge "Fix wrong initialization order in FAdviser" into rvc-dev
diff --git a/jni/FuseDaemon.cpp b/jni/FuseDaemon.cpp
index 0bc19f1..1ff69a0 100644
--- a/jni/FuseDaemon.cpp
+++ b/jni/FuseDaemon.cpp
@@ -1621,7 +1621,9 @@
}
// Custom logging for libfuse
- fuse_set_log_func(fuse_logger);
+ if (android::base::GetBoolProperty("persist.sys.fuse.log", false)) {
+ fuse_set_log_func(fuse_logger);
+ }
struct fuse_session
* se = fuse_session_new(&args, &ops, sizeof(ops), &fuse_default);
@@ -1631,7 +1633,7 @@
}
fuse_default.se = se;
fuse_default.active = &active;
- se->fd = fd;
+ se->fd = fd.release(); // libfuse owns the FD now
se->mountpoint = strdup(path.c_str());
// Single thread. Useful for debugging
diff --git a/jni/node-inl.h b/jni/node-inl.h
index e9b63bb..c7d30df 100644
--- a/jni/node-inl.h
+++ b/jni/node-inl.h
@@ -72,7 +72,7 @@
// can assert that we only ever return an active node in response to a lookup.
class NodeTracker {
public:
- NodeTracker(std::recursive_mutex* lock) : lock_(lock) {}
+ explicit NodeTracker(std::recursive_mutex* lock) : lock_(lock) {}
void CheckTracked(__u64 ino) const {
if (kEnableInodeTracking) {
@@ -228,7 +228,7 @@
std::vector<std::string> matches;
for (node* child : children_) {
- std::string child_name = child->GetName();
+ const std::string& child_name = child->GetName();
if (!strcasecmp(name_char, child_name.c_str())) {
matches.push_back(child_name);
}
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 74d70be..5c4d315 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -23,7 +23,7 @@
<string name="unknown" msgid="2059049215682829375">"غير معروف"</string>
<string name="root_images" msgid="5861633549189045666">"الصور"</string>
<string name="root_videos" msgid="8792703517064649453">"الفيديوهات"</string>
- <string name="root_audio" msgid="3505830755201326018">"الصوت"</string>
+ <string name="root_audio" msgid="3505830755201326018">"صوتيات"</string>
<string name="root_documents" msgid="3829103301363849237">"المستندات"</string>
<string name="permission_required" msgid="1460820436132943754">"مطلوب الحصول على إذن لتعديل هذا العنصر أو حذفه."</string>
<string name="permission_required_action" msgid="706370952366113539">"متابعة"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4279f89..12ec655 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"मीडिया मेमोरी"</string>
<string name="artist_label" msgid="8105600993099120273">"कलाकार"</string>
<string name="unknown" msgid="2059049215682829375">"अज्ञात"</string>
- <string name="root_images" msgid="5861633549189045666">"चित्र"</string>
+ <string name="root_images" msgid="5861633549189045666">"इमेज"</string>
<string name="root_videos" msgid="8792703517064649453">"वीडियो"</string>
<string name="root_audio" msgid="3505830755201326018">"ऑडियो"</string>
<string name="root_documents" msgid="3829103301363849237">"दस्तावेज़"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 1efefcd..2eed59d 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -21,7 +21,7 @@
<string name="app_label" msgid="9035307001052716210">"ਮੀਡੀਆ ਸਟੋਰੇਜ"</string>
<string name="artist_label" msgid="8105600993099120273">"ਕਲਾਕਾਰ"</string>
<string name="unknown" msgid="2059049215682829375">"ਅਗਿਆਤ"</string>
- <string name="root_images" msgid="5861633549189045666">"ਚਿਤਰ"</string>
+ <string name="root_images" msgid="5861633549189045666">"ਚਿੱਤਰ"</string>
<string name="root_videos" msgid="8792703517064649453">"ਵੀਡੀਓ"</string>
<string name="root_audio" msgid="3505830755201326018">" ਆਡੀਓ"</string>
<string name="root_documents" msgid="3829103301363849237">"ਦਸਤਾਵੇਜ਼"</string>