summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2020-07-01 20:35:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-01 20:35:14 +0000
commitc46cb0c069d4ece5d36d75444f489a9b9fdbfcdf (patch)
tree1d562ae80e669fc96658c453d083afafbcd5614f
parent84df8ffa837faee7d3626720eddb4e4ee691a86c (diff)
parent017f3a1ca63abc4fe4356131fa4e266be79d7912 (diff)
Merge "binder parcel: restrict on APEX" am: 066ff58724 am: 017f3a1ca6
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1320220 Change-Id: I278738954799ed6fa1763aad6e86c810b4e83602
-rw-r--r--libs/binder/ndk/include_platform/android/binder_parcel_platform.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_parcel_platform.h b/libs/binder/ndk/include_platform/android/binder_parcel_platform.h
index ac46cb80f4..114a781232 100644
--- a/libs/binder/ndk/include_platform/android/binder_parcel_platform.h
+++ b/libs/binder/ndk/include_platform/android/binder_parcel_platform.h
@@ -20,6 +20,10 @@
__BEGIN_DECLS
+#if defined(__ANDROID_APEX__) || defined(__ANDROID_VNDK__)
+#error this is only for platform code
+#endif
+
/**
* Gets whether or not FDs are allowed by this AParcel
*
@@ -29,4 +33,4 @@ __BEGIN_DECLS
*/
bool AParcel_getAllowFds(const AParcel*);
-__END_DECLS \ No newline at end of file
+__END_DECLS