ril: fix libril if we don't overwrite the header in our device tree

Change-Id: Ic580b80b28c738828f4c19aeb54421d9f98c7d40

3 files changed, 125 insertions, 0 deletions

diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index c5e1c5e..412a854 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -36,6 +36,7 @@ ifneq ($(filter m7450 xmm7260,$(BOARD_MODEM_TYPE)),)
 LOCAL_CFLAGS += -DNEEDS_VIDEO_CALL_FIELD
 endif
 
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADER)/librilutils
 LOCAL_C_INCLUDES += external/nanopb-c
 
diff --git a/ril/libril/include/telephony/ril_commands_vendor.h b/ril/libril/include/telephony/ril_commands_vendor.h
new file mode 100644
index 0000000..9121407
--- /dev/null
+++ b/ril/libril/include/telephony/ril_commands_vendor.h
@@ -0,0 +1,69 @@
+/* //device/libs/telephony/ril_commands.h
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+    {10000, NULL, NULL},
+    {10001, NULL, NULL},
+    {RIL_REQUEST_GET_CELL_BROADCAST_CONFIG, dispatchVoid, responseVoid},
+    {10003, NULL, NULL},
+    {10004, NULL, NULL},
+    {RIL_REQUEST_SEND_ENCODED_USSD, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SET_PDA_MEMORY_STATUS, dispatchVoid, responseVoid},
+    {RIL_REQUEST_GET_PHONEBOOK_STORAGE_INFO, dispatchVoid, responseVoid},
+    {RIL_REQUEST_GET_PHONEBOOK_ENTRY, dispatchVoid, responseVoid},
+    {RIL_REQUEST_ACCESS_PHONEBOOK_ENTRY, dispatchVoid, responseVoid},
+    {RIL_REQUEST_DIAL_VIDEO_CALL, dispatchVoid, responseVoid},
+    {RIL_REQUEST_CALL_DEFLECTION, dispatchVoid, responseVoid},
+    {RIL_REQUEST_READ_SMS_FROM_SIM, dispatchVoid, responseVoid},
+    {RIL_REQUEST_USIM_PB_CAPA, dispatchVoid, responseVoid},
+    {RIL_REQUEST_LOCK_INFO, dispatchVoid, responseVoid},
+    {10015, NULL, NULL},
+    {RIL_REQUEST_DIAL_EMERGENCY, dispatchDial, responseVoid},
+    {RIL_REQUEST_GET_STOREAD_MSG_COUNT, dispatchVoid, responseVoid},
+    {RIL_REQUEST_STK_SIM_INIT_EVENT, dispatchVoid, responseVoid},
+    {RIL_REQUEST_GET_LINE_ID, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SET_LINE_ID, dispatchVoid, responseVoid},
+    {RIL_REQUEST_GET_SERIAL_NUMBER, dispatchVoid, responseVoid},
+    {RIL_REQUEST_GET_MANUFACTURE_DATE_NUMBER, dispatchVoid, responseVoid},
+    {RIL_REQUEST_GET_BARCODE_NUMBER, dispatchVoid, responseVoid},
+    {RIL_REQUEST_UICC_GBA_AUTHENTICATE_BOOTSTRAP, dispatchVoid, responseVoid},
+    {RIL_REQUEST_UICC_GBA_AUTHENTICATE_NAF, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SIM_TRANSMIT_BASIC, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SIM_OPEN_CHANNEL, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SIM_CLOSE_CHANNEL, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SIM_TRANSMIT_CHANNEL, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SIM_AUTH, dispatchVoid, responseVoid},
+    {RIL_REQUEST_PS_ATTACH, dispatchVoid, responseVoid},
+    {RIL_REQUEST_PS_DETACH, dispatchVoid, responseVoid},
+    {RIL_REQUEST_ACTIVATE_DATA_CALL, dispatchVoid, responseVoid},
+    {RIL_REQUEST_CHANGE_SIM_PERSO, dispatchVoid, responseVoid},
+    {RIL_REQUEST_ENTER_SIM_PERSO, dispatchVoid, responseVoid},
+    {RIL_REQUEST_GET_TIME_INFO, dispatchVoid, responseVoid},
+    {RIL_REQUEST_OMADM_SETUP_SESSION, dispatchVoid, responseVoid},
+    {RIL_REQUEST_OMADM_SERVER_START_SESSION, dispatchVoid, responseVoid},
+    {RIL_REQUEST_OMADM_CLIENT_START_SESSION, dispatchVoid, responseVoid},
+    {RIL_REQUEST_OMADM_SEND_DATA, dispatchVoid, responseVoid},
+    {RIL_REQUEST_CDMA_GET_DATAPROFILE, dispatchVoid, responseVoid},
+    {RIL_REQUEST_CDMA_SET_DATAPROFILE, dispatchVoid, responseVoid},
+    {RIL_REQUEST_CDMA_GET_SYSTEMPROPERTIES, dispatchVoid, responseVoid},
+    {RIL_REQUEST_CDMA_SET_SYSTEMPROPERTIES, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SEND_SMS_COUNT, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SEND_SMS_MSG, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SEND_SMS_MSG_READ_STATUS, dispatchVoid, responseVoid},
+    {RIL_REQUEST_MODEM_HANGUP, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SET_SIM_POWER, dispatchVoid, responseVoid},
+    {RIL_REQUEST_SET_PREFERRED_NETWORK_LIST, dispatchVoid, responseVoid},
+    {RIL_REQUEST_GET_PREFERRED_NETWORK_LIST, dispatchVoid, responseVoid},
+    {RIL_REQUEST_HANGUP_VT, dispatchVoid, responseVoid},
diff --git a/ril/libril/include/telephony/ril_unsol_commands_vendor.h b/ril/libril/include/telephony/ril_unsol_commands_vendor.h
new file mode 100644
index 0000000..0a9b657
--- /dev/null
+++ b/ril/libril/include/telephony/ril_unsol_commands_vendor.h
@@ -0,0 +1,55 @@
+/* //device/libs/telephony/ril_unsol_commands.h
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+    {SAMSUNG_UNSOL_RESPONSE_BASE, NULL, WAKE_PARTIAL},
+    {RIL_UNSOL_RELEASE_COMPLETE_MESSAGE, responseVoid, WAKE_PARTIAL}, // 11001
+    {RIL_UNSOL_STK_SEND_SMS_RESULT, responseInts, WAKE_PARTIAL}, // 11002
+    {RIL_UNSOL_STK_CALL_CONTROL_RESULT, responseVoid, WAKE_PARTIAL}, // 11003
+    {RIL_UNSOL_DUN_CALL_STATUS, responseVoid, WAKE_PARTIAL}, // 11004
+    {11005, NULL, WAKE_PARTIAL},
+    {11006, NULL, WAKE_PARTIAL},
+    {RIL_UNSOL_O2_HOME_ZONE_INFO, responseVoid, WAKE_PARTIAL}, // 11007
+    {RIL_UNSOL_DEVICE_READY_NOTI, responseVoid, WAKE_PARTIAL}, // 11008
+    {RIL_UNSOL_GPS_NOTI, responseVoid, WAKE_PARTIAL}, // 11009
+    {RIL_UNSOL_AM, responseString, WAKE_PARTIAL}, // 11010
+    {RIL_UNSOL_DUN_PIN_CONTROL_SIGNAL, responseVoid, WAKE_PARTIAL}, // 11011
+    {RIL_UNSOL_DATA_SUSPEND_RESUME, responseInts, WAKE_PARTIAL}, // 11012
+    {RIL_UNSOL_SAP, responseVoid, WAKE_PARTIAL}, // 11013
+    {11014, NULL, WAKE_PARTIAL},
+    {RIL_UNSOL_SIM_SMS_STORAGE_AVAILALE, responseVoid, WAKE_PARTIAL}, // 11015
+    {RIL_UNSOL_HSDPA_STATE_CHANGED, responseVoid, WAKE_PARTIAL}, // 11016
+    {RIL_UNSOL_WB_AMR_STATE, responseInts, WAKE_PARTIAL}, // 11017
+    {RIL_UNSOL_TWO_MIC_STATE, responseInts, WAKE_PARTIAL}, // 11018
+    {RIL_UNSOL_DHA_STATE, responseVoid, WAKE_PARTIAL}, // 11019
+    {RIL_UNSOL_UART, responseVoid, WAKE_PARTIAL}, // 11020
+    {RIL_UNSOL_RESPONSE_HANDOVER, responseVoid, WAKE_PARTIAL}, // 11021
+    {RIL_UNSOL_IPV6_ADDR, responseVoid, WAKE_PARTIAL}, // 11022
+    {RIL_UNSOL_NWK_INIT_DISC_REQUEST, responseVoid, WAKE_PARTIAL}, // 11023
+    {RIL_UNSOL_RTS_INDICATION, responseVoid, WAKE_PARTIAL}, // 11024
+    {RIL_UNSOL_OMADM_SEND_DATA, responseVoid, WAKE_PARTIAL}, // 11025
+    {RIL_UNSOL_DUN, responseVoid, WAKE_PARTIAL}, // 11026
+    {RIL_UNSOL_SYSTEM_REBOOT, responseVoid, WAKE_PARTIAL}, // 11027
+    {RIL_UNSOL_VOICE_PRIVACY_CHANGED, responseVoid, WAKE_PARTIAL}, // 11028
+    {RIL_UNSOL_UTS_GETSMSCOUNT, responseVoid, WAKE_PARTIAL}, // 11029
+    {RIL_UNSOL_UTS_GETSMSMSG, responseVoid, WAKE_PARTIAL}, // 11030
+    {RIL_UNSOL_UTS_GET_UNREAD_SMS_STATUS, responseVoid, WAKE_PARTIAL}, // 11031
+    {RIL_UNSOL_MIP_CONNECT_STATUS, responseVoid, WAKE_PARTIAL}, // 11032
+#ifdef RIL_UNSOL_SNDMGR_WB_AMR_REPORT
+    {RIL_UNSOL_SNDMGR_WB_AMR_REPORT, responseInts, WAKE_PARTIAL}, // 20017
+#endif
+#ifdef RIL_UNSOL_SNDMGR_CLOCK_CTRL
+    {RIL_UNSOL_SNDMGR_CLOCK_CTRL, responseInts, WAKE_PARTIAL}, // 20022
+#endif