aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Repinski <repinski23@gmail.com>2016-09-08 12:56:40 -0500
committerAndreas Blaesius <skate4life@gmx.de>2017-07-17 22:04:29 +0200
commitfb29665c7f931f8bf748970a3133786004f0fc12 (patch)
tree029318db3839c1eb394add23c8419ad2e05f228f
parent1f2b77a3b0279cd286349cf3d1b60bae7a91e824 (diff)
downloaddevice_samsung_espresso3g-fb29665c7f931f8bf748970a3133786004f0fc12.tar.gz
device_samsung_espresso3g-fb29665c7f931f8bf748970a3133786004f0fc12.tar.bz2
device_samsung_espresso3g-fb29665c7f931f8bf748970a3133786004f0fc12.zip
libsecril-shim: Fix CommandInfo struct definition by using libbinder
Change-Id: I5024bf2f3334ece3823a3a1aa1598bfebb54a4e6
-rw-r--r--rilsrc/libsecril-shim/Android.mk3
-rw-r--r--rilsrc/libsecril-shim/secril-shim.h5
2 files changed, 5 insertions, 3 deletions
diff --git a/rilsrc/libsecril-shim/Android.mk b/rilsrc/libsecril-shim/Android.mk
index 176e05e..ca978cd 100644
--- a/rilsrc/libsecril-shim/Android.mk
+++ b/rilsrc/libsecril-shim/Android.mk
@@ -9,7 +9,8 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := \
liblog \
libril \
- libcutils
+ libcutils \
+ libbinder
LOCAL_CFLAGS := -Wall -Werror
diff --git a/rilsrc/libsecril-shim/secril-shim.h b/rilsrc/libsecril-shim/secril-shim.h
index dd73e13..e759f61 100644
--- a/rilsrc/libsecril-shim/secril-shim.h
+++ b/rilsrc/libsecril-shim/secril-shim.h
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
+#include <binder/Parcel.h>
#include <cutils/compiler.h>
#include <cutils/properties.h>
#include <sys/cdefs.h>
@@ -53,8 +54,8 @@ typedef struct
/* TODO: Do we really need to redefine these? They aren't in a header... */
typedef struct {
int requestNumber;
- void (*dispatchFunction) (void *p, void *pRI);
- int(*responseFunction) (void *p, void *response, size_t responselen);
+ void (*dispatchFunction) (android::Parcel &p, struct RequestInfo *pRI);
+ int(*responseFunction) (android::Parcel &p, void *response, size_t responselen);
} CommandInfo;
typedef struct RequestInfo {