commit 6c7ab544d029bbbde890a6e129c4e7d55d7111dd
author Zimuzo Ezeozue <zezeozue@google.com> Tue Jan 19 08:45:29 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 19 08:45:29 2021 +0000
tree de7e8f977d51000fefa624527a2698fdebde11f9
parent a3796477f558833803a65ad74f7c676bd126d5dc
parent 5b4ae62d5b3ae3527bdd285820722eb43424304e

Merge "Fix wrong FUSE-JNI uid and tid"

jni/FuseDaemon.cpp

diff --git a/jni/FuseDaemon.cpp b/jni/FuseDaemon.cpp
index e1e7547..59d9ef1 100755
--- a/jni/FuseDaemon.cpp
+++ b/jni/FuseDaemon.cpp
@@ -1143,7 +1143,7 @@
     }
 
     int keep_cache = 1;
-    handle* h = create_handle_for_node(fuse, io_path, fd, req->ctx.uid, node,
+    handle* h = create_handle_for_node(fuse, io_path, fd, result->uid, node,
                                        result->redaction_info.release(), &keep_cache);
     fi->fh = ptr_to_id(h);
     fi->keep_cache = keep_cache;

jni/MediaProviderWrapper.cpp

diff --git a/jni/MediaProviderWrapper.cpp b/jni/MediaProviderWrapper.cpp
index 99fe081..40570ad 100644
--- a/jni/MediaProviderWrapper.cpp
+++ b/jni/MediaProviderWrapper.cpp
@@ -486,7 +486,8 @@
     ScopedLocalRef<jstring> j_path(env, env->NewStringUTF(path.c_str()));
 
     ScopedLocalRef<jobject> j_res_file_lookup_object(
-            env, env->CallObjectMethod(media_provider_object_, mid_file_lookup_, j_path.get(), uid));
+            env, env->CallObjectMethod(media_provider_object_, mid_file_lookup_, j_path.get(), uid,
+                                       tid));
 
     if (CheckForJniException(env)) {
         return nullptr;