commit 7e6ce05500cb44b41386ca8941af13383100c0aa
author Alan Stokes <alanstokes@google.com> Fri Sep 17 08:07:04 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 17 08:07:04 2021 +0000
tree 5d98737de5f8bdcf93b1e19e85a102efe2b89fc8
parent 68d98c4172a805824906ab848c6dd5c65329dbaa
parent 26209e4e43114c0d690271028d862f46731616bc

Merge "Implement IntoRawFd for ParcelFileDescriptor."

cmds/cmd/cmd.cpp

diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp
index be2c702..8f1c01a 100644
--- a/cmds/cmd/cmd.cpp
+++ b/cmds/cmd/cmd.cpp
@@ -52,7 +52,7 @@
 }
 
 struct SecurityContext_Delete {
-    void operator()(security_context_t p) const {
+    void operator()(char* p) const {
         freecon(p);
     }
 };
@@ -108,7 +108,7 @@
         }
         if (is_selinux_enabled() && seLinuxContext.size() > 0) {
             String8 seLinuxContext8(seLinuxContext);
-            security_context_t tmp = nullptr;
+            char* tmp = nullptr;
             getfilecon(fullPath.string(), &tmp);
             Unique_SecurityContext context(tmp);
             if (checkWrite) {

libs/binder/include_tls/binder/RpcCertificateVerifier.h

diff --git a/libs/binder/include/binder/RpcCertificateVerifier.h b/libs/binder/include_tls/binder/RpcCertificateVerifier.h
similarity index 100%
rename from libs/binder/include/binder/RpcCertificateVerifier.h
rename to libs/binder/include_tls/binder/RpcCertificateVerifier.h