commit 953954217489c6523af62c456aa939c39e409433
author Tom Cherry <tomcherry@google.com> Tue Sep 22 13:51:52 2015 -0700
committer Tom Cherry <tomcherry@google.com> Fri Dec 04 14:11:02 2015 -0800
tree 42e0b0df5d5487157eb7e88e32b5ffa3ea319fce
parent f89e6c513e4424148c67cf1786c797b1be02a1d6

Remove ANDROID_PROPERTY_WORKSPACE

Bug 23290008

Change-Id: I95babe735444ada10c67594ace700cae5d1ec0b3

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 66e46f8..fdfaa58 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -64,13 +64,6 @@
 
 static int property_set_fd = -1;
 
-struct workspace {
-    size_t size;
-    int fd;
-};
-
-static workspace pa_workspace;
-
 void property_init() {
     if (property_area_initialized) {
         return;
@@ -82,13 +75,6 @@
         ERROR("Failed to initialize property area\n");
         exit(1);
     }
-
-    pa_workspace.size = 0;
-    pa_workspace.fd = open(PROP_FILENAME, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
-    if (pa_workspace.fd == -1) {
-        ERROR("Failed to open %s: %s\n", PROP_FILENAME, strerror(errno));
-        return;
-    }
 }
 
 static int check_mac_perms(const char *name, char *sctx, struct ucred *cr)
@@ -354,12 +340,6 @@
     }
 }
 
-void get_property_workspace(int *fd, int *sz)
-{
-    *fd = pa_workspace.fd;
-    *sz = pa_workspace.size;
-}
-
 static void load_properties_from_file(const char *, const char *);
 
 /*

init/property_service.h

diff --git a/init/property_service.h b/init/property_service.h
index 8b76d2b..b662978 100644
--- a/init/property_service.h
+++ b/init/property_service.h
@@ -32,7 +32,6 @@
 extern void load_persist_props(void);
 extern void load_system_props(void);
 extern void start_property_service(void);
-void get_property_workspace(int *fd, int *sz);
 std::string property_get(const char* name);
 extern int property_set(const char *name, const char *value);
 extern bool properties_initialized();

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index a3c5ca4..4e5f464 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -400,14 +400,7 @@
 
     pid_t pid = fork();
     if (pid == 0) {
-        int fd, sz;
-
         umask(077);
-        if (properties_initialized()) {
-            get_property_workspace(&fd, &sz);
-            std::string tmp = StringPrintf("%d,%d", dup(fd), sz);
-            add_environment("ANDROID_PROPERTY_WORKSPACE", tmp.c_str());
-        }
 
         for (const auto& ei : envvars_) {
             add_environment(ei.name.c_str(), ei.value.c_str());