summaryrefslogtreecommitdiff
path: root/jni/node-inl.h
diff options
context:
space:
mode:
author Sahana Rao <sahanas@google.com> 2020-03-05 19:27:37 +0000
committer Sahana Rao <sahanas@google.com> 2020-03-16 19:07:31 +0000
commitee321364e7599747f4154f3efd5f4ca48f73301c (patch)
tree7e4d9e9bb947b04800f301aa6fff6a5c150a259a /jni/node-inl.h
parentd9e894077d6700b4ed5e2b58a0024c46b986ad75 (diff)
Revert "Save calling UID on FUSE pf_create"
This is a revert of Ibc7f43e3f2cb2c76331206cbfc2d82f09277e712. Earlier saved calling UID was used to update owner package name for files created by apps that bypass scoped storage restrictions. Using scanFile on FUSE RELEASE introduces some race conditions (Refer:b/149989434). scanFile on RELEASE will be replaced by insert on create, hence reverting "save calling UID" changes. Test: atest FuseDaemonHostTest Test: atest fuse_node_test Bug: 149989434 Change-Id: Ibfa60d7078e2bc74642c6aaa4468249a387f718f
Diffstat (limited to 'jni/node-inl.h')
-rw-r--r--jni/node-inl.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/jni/node-inl.h b/jni/node-inl.h
index 5098316c4..a146d2047 100644
--- a/jni/node-inl.h
+++ b/jni/node-inl.h
@@ -36,16 +36,14 @@ namespace mediaprovider {
namespace fuse {
struct handle {
- explicit handle(const std::string& path, int fd, const RedactionInfo* ri, uid_t owner_uid,
- bool cached)
- : path(path), fd(fd), ri(ri), owner_uid(owner_uid), cached(cached) {
+ explicit handle(const std::string& path, int fd, const RedactionInfo* ri, bool cached)
+ : path(path), fd(fd), ri(ri), cached(cached) {
CHECK(ri != nullptr);
}
const std::string path;
const int fd;
const std::unique_ptr<const RedactionInfo> ri;
- const uid_t owner_uid;
const bool cached;
~handle() { close(fd); }