commit fa96af82f3d30dbfba2093f6575dc10eeee71da6
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 17 22:30:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 17 22:30:34 2018 +0000
tree a9ace740f44b1836898f40d9356b2f01267147a7
parent 3a7f95af094d820ba11943ad1a7eee23fecd09b9
parent 024a1241a68a912eab39e6898e3a96e4b9644845

Merge "vold uses health filesystem HAL"

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index c8dbf77..dcf92be 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -3,3 +3,6 @@
 
 [Builtin Hooks Options]
 clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
+
+[Hook Scripts]
+aosp_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "."

secdiscard.cpp

diff --git a/secdiscard.cpp b/secdiscard.cpp
index 60834e8..25a0826 100644
--- a/secdiscard.cpp
+++ b/secdiscard.cpp
@@ -73,7 +73,7 @@
 #define F2FS_IOCTL_MAGIC		0xf5
 #endif
 #define F2FS_IOC_SET_PIN_FILE	_IOW(F2FS_IOCTL_MAGIC, 13, __u32)
-#define F2FS_IOC_GET_PIN_FILE	_IOW(F2FS_IOCTL_MAGIC, 14, __u32)
+#define F2FS_IOC_GET_PIN_FILE	_IOR(F2FS_IOCTL_MAGIC, 14, __u32)
 #endif
         android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(
             target.c_str(), O_WRONLY, 0)));