commit 002fa789e6e56f94456794c9df5b5a3c03a44cce
author Steven Moreland <smoreland@google.com> Mon Oct 15 20:39:43 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 15 20:39:43 2018 +0000
tree be8ef9081f5c6447837a603cd7e486bbc234504c
parent f1052be51f2de0aa1f33902202b01626c0fb10ec
parent dd772b4a3a7830670113bcfb8a263b6f549181b2

Merge changes from topic "b116618418"

* changes:
  Status: no 'okay' EX_TRANSACTION_FAILED
  Revert "Status writeToParcel no OK on ERR"

transport/token/1.0/utils/include/hidl/HybridInterface.h

diff --git a/transport/token/1.0/utils/include/hidl/HybridInterface.h b/transport/token/1.0/utils/include/hidl/HybridInterface.h
index 984555e..595c2e3 100644
--- a/transport/token/1.0/utils/include/hidl/HybridInterface.h
+++ b/transport/token/1.0/utils/include/hidl/HybridInterface.h
@@ -240,6 +240,10 @@
         onTransact(
         uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) {
     if (code == GET_HAL_TOKEN) {
+        if (!data.enforceInterface(BaseInterface::getInterfaceDescriptor())) {
+            return BAD_TYPE;
+        }
+
         HalToken token;
         bool result;
         result = createHalToken(mBase, &token);