commit 31d204ce1f569b1a26eee43e8dbc73ac1a9c67a3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 18 01:25:21 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 18 01:25:21 2019 +0000
tree 2845b82c9d606a444e355309922821b97d5631ab
parent c4d2f8aea75c325b1319d32fd9cc1f831513f0e9
parent 491e133c6a2d6fed5c0e58698ffdb480fa94431e

Merge "libbinder: don't export private ParcelValTypes.h"

libs/binder/ParcelValTypes.h

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

libs/binder/PersistableBundle.cpp

diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp
index c0aec0a..97a6c94 100644
--- a/libs/binder/PersistableBundle.cpp
+++ b/libs/binder/PersistableBundle.cpp
@@ -17,7 +17,6 @@
 #define LOG_TAG "PersistableBundle"
 
 #include <binder/PersistableBundle.h>
-#include <private/binder/ParcelValTypes.h>
 
 #include <limits>
 
@@ -26,6 +25,8 @@
 #include <log/log.h>
 #include <utils/Errors.h>
 
+#include "ParcelValTypes.h"
+
 using android::BAD_TYPE;
 using android::BAD_VALUE;
 using android::NO_ERROR;