diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-06-11 23:13:33 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-06-23 13:17:28 +0200 |
| commit | fb536a46b0c0971b9c5f81eadc3574f9c569aadd (patch) | |
| tree | a4c4065a1092931b18681ea54a212e48e2c13476 | |
| parent | cbb420bca1818b222913c784292f39f4a91b1ee8 (diff) | |
| download | device_samsung_espresso3g-fb536a46b0c0971b9c5f81eadc3574f9c569aadd.zip device_samsung_espresso3g-fb536a46b0c0971b9c5f81eadc3574f9c569aadd.tar.gz device_samsung_espresso3g-fb536a46b0c0971b9c5f81eadc3574f9c569aadd.tar.bz2 | |
remove code and SELinux rules for the proprietary RIL
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
23 files changed, 0 insertions, 2884 deletions
diff --git a/rilsrc/Android.mk b/rilsrc/Android.mk deleted file mode 100644 index 5fb5d16..0000000 --- a/rilsrc/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2013 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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/rilsrc/libsecnativefeature/Android.mk b/rilsrc/libsecnativefeature/Android.mk deleted file mode 100644 index 2276655..0000000 --- a/rilsrc/libsecnativefeature/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := \ - SecNativeFeatureCIf.cpp \ - SecNativeFeatureCppIf.cpp - -LOCAL_C_INCLUDES += \ - external/expat/lib - -LOCAL_SHARED_LIBRARIES := \ - libexpat - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_MODULE := libsecnativefeature - -include $(BUILD_SHARED_LIBRARY) diff --git a/rilsrc/libsecnativefeature/SecNativeFeature.h b/rilsrc/libsecnativefeature/SecNativeFeature.h deleted file mode 100644 index 495471d..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeature.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef SEC_NATIVE_FEATURE_H -#define SEC_NATIVE_FEATURE_H - -#include "SecNativeFeatureTagAll.h" - -// define TAG for default value -/* -#define Str_NoTag "" -#define Bool_NoTag false -#define Int_NoTag (0) - -#define TAG_BOOLEAN_TEST_TRUE "CscFeature_BooleanTestTrue" -#define TAG_BOOLEAN_TEST_FALSE "CscFeature_BooleanTestFalse" -#define TAG_BOOLEAN_TEST_NULL "CscFeature_BooleanTestNull" -#define TAG_STRING_TEST "CscFeature_StringTest" -#define TAG_STRING_TEST_NULL "CscFeature_StringTestNull" -#define TAG_INTEGER_TEST "CscFeature_IntegerTest" -#define TAG_INTEGER_TEST_NULL "CscFeature_IntegerTestNull" - -#define TAG_FMRADIO_RTPLUS "CscFeature_FMRadioRTPlus" -#define TAG_FMRADIO_SEASETTING "CscFeature_FMRadioSEASetting" -*/ - -#ifdef __cplusplus -#include "SecNativeFeatureCppIf.h" -#else -#include "SecNativeFeatureCIf.h" -#endif - -#endif // SEC_NATIVE_FEATURE_H - diff --git a/rilsrc/libsecnativefeature/SecNativeFeatureCIf.cpp b/rilsrc/libsecnativefeature/SecNativeFeatureCIf.cpp deleted file mode 100644 index ad905df..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeatureCIf.cpp +++ /dev/null @@ -1,85 +0,0 @@ -#include <string> -#include <iostream> -#include "SecNativeFeatureCppIf.h" -#include "SecNativeFeatureCIf.h" -#include <expat.h> -#include <stdlib.h> - - -int -SecNativeFeature_getEnableStatus(const char* tag) -{ - SecNativeFeature* instance = SecNativeFeature::getInstance(); - - if (instance) - { - return instance->getEnableStatus(tag); - } - - return 0; -} - -int -SecNativeFeature_getEnableStatusWithDefault(const char* tag, int defaultValue) -{ - SecNativeFeature* instance = SecNativeFeature::getInstance(); - - if (instance) - { - return instance->getEnableStatus(tag, defaultValue); - } - - return defaultValue; -} - -int -SecNativeFeature_getInteger(const char* tag) -{ - SecNativeFeature* instance = SecNativeFeature::getInstance(); - - if (instance) - { - return instance->getInteger(tag); - } - - return -1; -} - -int -SecNativeFeature_getIntegerWithDefault(const char* tag, int defaultValue) -{ - SecNativeFeature* instance = SecNativeFeature::getInstance(); - - if (instance) - { - return instance->getInteger(tag, defaultValue); - } - - return defaultValue; -} - -const char* -SecNativeFeature_getString(const char* tag) -{ - SecNativeFeature* instance = SecNativeFeature::getInstance(); - - if (instance) - { - return instance->getString(tag); - } - - return NULL; -} - -const char* -SecNativeFeature_getStringWithDefault(const char* tag, char* defaultValue) -{ - SecNativeFeature* instance = SecNativeFeature::getInstance(); - - if (instance) - { - return instance->getString(tag, defaultValue); - } - - return defaultValue; -} diff --git a/rilsrc/libsecnativefeature/SecNativeFeatureCIf.h b/rilsrc/libsecnativefeature/SecNativeFeatureCIf.h deleted file mode 100644 index 3d26168..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeatureCIf.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef SEC_NATIVE_FEATURE_CIF_H -#define SEC_NATIVE_FEATURE_CIF_H - -#ifdef __cplusplus -#define DECLARE_BEGIN_C extern "C" { -#define DECLARE_END_C } -#else -#define DECLARE_BEGIN_C -#define DECLARE_END_C -#endif - -DECLARE_BEGIN_C - -int SecNativeFeature_getEnableStatus(const char* tag); -int SecNativeFeature_getEnableStatusWithDefault(const char* tag, int defaultValue); -int SecNativeFeature_getInteger(const char* tag); -int SecNativeFeature_getIntegerWithDefault(const char* tag, int defaultValue); -const char* SecNativeFeature_getString(const char* tag); -const char* SecNativeFeature_getStringWithDefault(const char* tag, char* defaultValue); - -DECLARE_END_C - -#endif // SEC_NATIVE_FEATURE_CIF_H - diff --git a/rilsrc/libsecnativefeature/SecNativeFeatureCppIf.cpp b/rilsrc/libsecnativefeature/SecNativeFeatureCppIf.cpp deleted file mode 100644 index 0c5bd10..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeatureCppIf.cpp +++ /dev/null @@ -1,187 +0,0 @@ -#include <string> -#include <iostream> -#include "SecNativeFeatureCppIf.h" -#include <expat.h> -#include <stdlib.h> - -// feature file location (which should be "/system/csc/feature.xml") -#define FEATURE_FILE "/system/csc/feature.xml" -// feature file location (which should be "/system/csc/others.xml") -#define MPS_FEATURE_FILE "/system/csc/others.xml" - -// XML parsing using expat lib - handlers -typedef struct{ - std::string curr_name; - std::map<std::string,std::string> *pFeatures; - int depth; -} ParserUserData; - -static void XMLCALL -charDataHandler(void *userData, const char *s, int len){ - ParserUserData* pData = (ParserUserData*)userData; - std::string value(s, len); - std::string curr_name = pData->curr_name; - - if(!curr_name.empty()){ - std::map<std::string,std::string>::iterator result = (*pData->pFeatures).find(curr_name); - - if (result != (*pData->pFeatures).end()) { - value = result->second + value; - (*pData->pFeatures).erase(curr_name); - } - - std::map<std::string,std::string>::iterator begin; - begin = (*pData->pFeatures).begin(); - std::pair<std::string,std::string> feature(curr_name,value); - (*pData->pFeatures).insert(begin, feature); - } - // else{ - // // printf("no name\n"); - // } -} - -static void XMLCALL -startElement(void *userData, const char *name, const char **atts) -{ - ParserUserData* pData = (ParserUserData*)userData; - pData->curr_name.assign(name); - pData->depth += 1; -} - -static void XMLCALL -endElement(void *userData, const char *name) -{ - ParserUserData* pData = (ParserUserData*)userData; - pData->curr_name.clear(); - pData->depth -= 1; -} - -// SecNativeFeture class implementation -SecNativeFeature* SecNativeFeature::_instance = NULL; -SecNativeFeature::SecNativeFeature() { - int load_result = 0; - _features.clear(); - load_result = _loadFeature(); - if (load_result == -1){ - // todo : handle _loadFeature errors here. - } -} - -SecNativeFeature::~SecNativeFeature() { - delete _instance; -} -SecNativeFeature* SecNativeFeature::getInstance() { - if(_instance == NULL) { - _instance = new SecNativeFeature(); - } - return _instance; -} - -bool SecNativeFeature::getEnableStatus(const char* tag) { - std::map<std::string,std::string>::iterator found; - found = _features.find(tag); - - if(found == _features.end()) { - return false; - } - - if(found->second.compare("true") == 0 || found->second.compare("TRUE") == 0) { - return true; - } - return false; -} - -bool SecNativeFeature::getEnableStatus(const char* tag, bool defaultValue) { - std::map<std::string,std::string>::iterator found; - found = _features.find(tag); - - if(found == _features.end()) { - return defaultValue; - } - - if(found->second.compare("true") == 0 || found->second.compare("TRUE") == 0) { - return true; - } - return defaultValue; -} - -const char* SecNativeFeature::getString(const char* tag) { - std::map<std::string,std::string>::iterator found; - found = _features.find(tag); - - if(found == _features.end()) { - return ""; - } - return found->second.c_str(); -} - -const char* SecNativeFeature::getString(const char* tag, char* defaultValue) { - std::map<std::string,std::string>::iterator found; - found = _features.find(tag); - - if(found == _features.end()) { - return defaultValue; - } - return found->second.c_str(); -} - -int SecNativeFeature::getInteger(const char* tag) { - std::map<std::string,std::string>::iterator found; - found = _features.find(tag); - - if(found == _features.end()) { - return -1; - } - std::string raw_value = _features.find(tag)->second; - return atoi(raw_value.c_str()); -} - -int SecNativeFeature::getInteger(const char* tag, int defaultValue) { - std::map<std::string,std::string>::iterator found; - found = _features.find(tag); - - if(found == _features.end()) { - return defaultValue; - } - std::string raw_value = _features.find(tag)->second; - return atoi(raw_value.c_str()); -} - -int SecNativeFeature::_loadFeature(){ - char buf[BUFSIZ]; - XML_Parser parser = XML_ParserCreate(NULL); - int done; - FILE * pFeatureFile = NULL; - ParserUserData userData; - userData.curr_name = std::string (); - userData.pFeatures = &_features; - userData.depth = 0; - - pFeatureFile = fopen(FEATURE_FILE, "r"); - if (pFeatureFile == NULL) { - pFeatureFile = fopen(MPS_FEATURE_FILE, "r"); - if (pFeatureFile == NULL) { - return -1; - } - } - XML_SetUserData(parser, &userData); - XML_SetElementHandler(parser, startElement, endElement); - XML_SetCharacterDataHandler(parser, charDataHandler); - do { - size_t len = fread(buf, 1, sizeof(buf), pFeatureFile); - if ((len != sizeof(buf)) && (ferror(pFeatureFile))){ - fclose(pFeatureFile); - return -1; - } - done = len < sizeof(buf); - if (XML_Parse(parser, buf, len, done) == XML_STATUS_ERROR) { - if(pFeatureFile) { - fclose(pFeatureFile); - } - return -1; - } - } while (!done); - XML_ParserFree(parser); - fclose(pFeatureFile); - return 0; -} diff --git a/rilsrc/libsecnativefeature/SecNativeFeatureCppIf.h b/rilsrc/libsecnativefeature/SecNativeFeatureCppIf.h deleted file mode 100644 index 37cb085..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeatureCppIf.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef SEC_NATIVE_FEATURE_CPPIF_H -#define SEC_NATIVE_FEATURE_CPPIF_H - -#include <string> -#include <map> - -class SecNativeFeature { -public: - bool getEnableStatus(const char* tag); - bool getEnableStatus(const char* tag, bool defaultValue); - const char* getString(const char* tag); - const char* getString(const char* tag, char* defaultValue); - int getInteger(const char* tag); - int getInteger(const char* tag, int defaultValue); - - static SecNativeFeature* getInstance(); -private: - static SecNativeFeature* _instance; - SecNativeFeature(); - ~SecNativeFeature(); - int _loadFeature(); - int _loadDefault(); - std::map<std::string,std::string> _features; -}; - -#endif // SEC_NATIVE_FEATURE_CPPIF_H - diff --git a/rilsrc/libsecnativefeature/SecNativeFeatureTagAll.h b/rilsrc/libsecnativefeature/SecNativeFeatureTagAll.h deleted file mode 100644 index 1bbc23f..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeatureTagAll.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * CSC Features - * Auto generated by gen_cscfeaturetag_ih.pl - * DO NOT EDIT THIS FILE - */ - -/* -#include "SecNativeFeatureTagGMS.h" -#include "SecNativeFeatureTagIMS.h" -#include "SecNativeFeatureTagMediaProvider.h" -#include "SecNativeFeatureTagNFC.h" -#include "SecNativeFeatureTagRIL.h" -#include "SecNativeFeatureTagStreaming.h" -#include "SecNativeFeatureTagWiFi.h" -#include "SecNativeFeatureTagBT.h" -*/ - -#include "SecNativeFeatureTagFramework.h" -#include "SecNativeFeatureTagCommon.h" -#include "SecNativeFeatureTagWeb.h" diff --git a/rilsrc/libsecnativefeature/SecNativeFeatureTagCommon.h b/rilsrc/libsecnativefeature/SecNativeFeatureTagCommon.h deleted file mode 100644 index 7439806..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeatureTagCommon.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef SEC_NATIVE_FEATURE_TAG_COMMON_H -#define SEC_NATIVE_FEATURE_TAG_COMMON_H - -// Note -// The string must be same as the string in CSCFeatureTagCommon.java -// Because one feature coulde be implemented both in java layer and in native layer -#define TAG_CSCFEATURE_COMMON_USECHAMELEON "CscFeature_Common_UseChameleon" - -#endif // SEC_NATIVE_FEATURE_TAG_COMMON_H diff --git a/rilsrc/libsecnativefeature/SecNativeFeatureTagFramework.h b/rilsrc/libsecnativefeature/SecNativeFeatureTagFramework.h deleted file mode 100644 index a29d67c..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeatureTagFramework.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef SEC_NATIVE_FEATURE_TAG_FRAMEWORK_H -#define SEC_NATIVE_FEATURE_TAG_FRAMEWORK_H - - -// Note -// The string must be same as the string in CSCFeatureTagFramework.java -// Because one feature coulde be implemented both in java layer and in native layer - - -#define TAG_CSCFEATURE_FRAMEWORK_ENABLEBIDIRECTION "CscFeature_Framework_EnableBidirection" - -#define TAG_CSCFEATURE_FRAMEWORK_ENABLEHARFBUZZ "CscFeature_Framework_EnableHarfbuzz" - -#define TAG_CSCFEATURE_FRAMEWORK_ENABLETHAIVIETRESHAPING "CscFeature_Framework_EnableThaiVietReshaping" - -#endif // SEC_NATIVE_FEATURE_TAG_FRAMEWORK_H diff --git a/rilsrc/libsecnativefeature/SecNativeFeatureTagWeb.h b/rilsrc/libsecnativefeature/SecNativeFeatureTagWeb.h deleted file mode 100644 index 100448a..0000000 --- a/rilsrc/libsecnativefeature/SecNativeFeatureTagWeb.h +++ /dev/null @@ -1,150 +0,0 @@ -#ifndef SEC_NATIVE_FEATURE_TAG_WEB_H -#define SEC_NATIVE_FEATURE_TAG_WEB_H - - -// Note -// The string must be same as the string in CSCFeatureTagWeb.java -// Because one feature coulde be implemented both in java layer and in native layer - -// The default values for each types -// This means the specified TAG is not defined -#define CSCFeatureTagWeb_Str_NoTag "" -#define CSCFeatureTagWeb_Bool_NoTag false -#define CSCFeatureTagWeb_Int_NoTag 0 - -// To define custom UserAgent string -// If this value is not defined, the default Android UserAgent will be sent to server -#define CSCFeatureTagWeb_SetUserAgent "CscFeature_Web_SetUserAgent" - - -// To define UAProfile string -// If this value is not defined, UAProfile will not be sent to server -#define CSCFeatureTagWeb_SetUAProfile "CscFeature_Web_SetUAProfile" - -// Change homepage_base regardless language and APN -#define CscFeatureTagWeb_SetHomepageURL "CscFeature_Web_SetHomepageURL" -// Disable RSS button on the url bar -#define CscFeatureTagWeb_DisableRSS "CscFeature_Web_DisableRSS" -// Remove voicesearch button on the url bar -#define CscFeatureTagWeb_DisableVoiceSearch "CscFeature_Web_DisableVoiceSearch" -// Disable showing activity chooser on redirecting in case when 3rd party browser also installed -#define CscFeatureTagWeb_DisableRedirectionChooser "CscFeature_Web_DisableRedirectionChooser" - -// Enable UAProfile in Header -#define CscFeatureTagWeb_Bool_EnableUAProfile "CscFeature_Web_Bool_EnableUAProfile" - -// To Enable the GateConfig Logs(USA STA requirement for stability test) -#define CscFeatureTagWeb_Bool_EnableGateConfig "CscFeature_Web_EnableLogStabililtyTest" - -//add for Handling Operator UA -#define CscFeature_Web_OverrideUserAgent "CscFeature_Web_OverrideUserAgent" - -// add menu clear today history -#define CscFeatureTagWeb_EnableDeletingTodayHistory "CscFeature_Web_EnableDeletingTodayHistory" - - // To enable bookmark overwrite -#define CscFeatureTagWeb_EnableOverwritingBookmark "CscFeature_Web_EnableOverwritingBookmark" - -// To enable downloaded folder notification -#define CscFeatureTagWeb_EnableDownloadedFolderInNotificationBar "CscFeature_Web_EnableDownloadedFolderInNotificationBar" - - //Enable DeviceID at Header(USA ATT Requirement) -#define CscFeatureTag_Web_Bool_DeviceID "CscFeature_Web_UseDeviceIdInHeader" - -// support uploading contacts in VCard format (China-Telecom requirement) -#define CscFeatureTagWeb_SupportVcfUpload "CscFeature_Web_SupportVcfUpload" -//Parse XHTML document as HTML (ignore parse error. China-Telecom requirement) -#define CscFeatureTagWeb_ParseXHtmlToHtml "CscFeature_Web_ParseXHtmlToHtml" - - //Block SD & CD download ( NAGSM common requirement) -#define CscFeatureTag_Web_Bool_BlockSDCDDownload "CscFeature_Web_BlockSDCDDownload" - -// display download progress on notification bar (China-Telecom requirement) -#define CscFeatureTagWeb_ShowDownloadProgressOnNotification "CscFeature_Web_ShowDownloadProgressOnNotification" - -// show browser version in browser settings (China-Telecom requirement) -#define CscFeatureTagWeb_ShowVersionInSetting "CscFeature_Web_ShowVersionInSetting" - -// support "exit browser" option (China-Telecom requirement) -#define CscFeatureTagWeb_AddOptionToTerminate "CscFeature_Web_AddOptionToTerminate" -// Add "Delete-all" function at Download list (China-Telecom requirement) -#define CscFeatureTagWeb_EnableDeleteAllOnDownloadList "CscFeature_Web_EnableDeleteAllOnDownloadList" -// Support save-as function and default folder by mime-type (China-Telecom requirement) -#define CscFeatureTagWeb_SupportDownloadSaveAs "CscFeature_Web_SupportDownloadSaveAs" -// support delete-all option in bookmarks page (China-Telecom requirement) -#define CscFeatureTagWeb_EnableDeleteAllBookmarks "CscFeature_Web_EnableDeleteAllBookmarks" -// Add "FullHandwriting IME issue "(China-Common requirement) -#define CscFeatureTagWeb_EnableOptionEditTextDuringFullHwr "CscFeature_Web_EnableOptionEditTextDuringFullHwr" -// support offline-startup page includes bookmarks, history, search dialog (China-Telecom requirement) -#define CscFeatureTagWeb_SupportOfflineStartupPage "CscFeature_Web_SupportOfflineStartupPage" - -// support not to set factory-reset-homepage to PREF_HOMEPAGE -#define CscFeatureTagWeb_Bool_DisableSetFactoryResetHomeToPrefHome "CscFeature_Web_Bool_DisableSetFactoryResetHomeToPrefHome" - -// Show roaming dialog (ATT Requirement) -#define CscFeatureTagWeb_Bool_ShowRoamingDialog "CscFeature_Web_EnableRoamingDialog" - -// set download folder by mime-type for China-Telecom requirement -#define CscFeatureTagWeb_SetDownloadFolderNameByMimeType "CscFeature_Web_SetDownloadFolderNameByMimeType" - -// Disable showing activity chooser for defined string -#define CscFeature_Web_DisableChooser4 "CscFeature_Web_DisableChooser4" - -// Enable download hebrew filename -#define CscFeature_Web_SupportHebrewFileName "CscFeature_Web_SupportHebrewFileName" - -// remove google in search engine list -#define CscFeatureTagWeb_DisableGoogleInBrowserSearchEngine "CscFeature_Web_DisableGoogleInBrowserSearchEngine" - -// set off overview mode as default (CTC Requirement) -#define CscFeatureTagWeb_SetOffOverviewModeAsDefault "CscFeature_Web_SetOffOverviewModeAsDefault" - -// Disable setting homepage as it is set in APN when SIM changed -#define CscFeature_Web_EnableAutoSimHomeUrlInProfile "CscFeature_Web_EnableAutoSimHomeUrlInProfile" - -// Add download file name decode feature for China region -#define CscFeatureTagWeb_SupportDownloadedFileNameInChineseChar "CscFeature_Web_SupportDownloadedFileNameInChineseChar" - -// support multiAPN (CMCC Requirement) -#define CscFeatureTagWeb_EnableMultipleApn4 "CscFeature_Web_EnableMultipleApn4" - -// Enable Ask to exit on back (CMCC Requirement) -#define CscFeatureTagWeb_EnablePromptToExit "CscFeature_Web_EnablePromptToExit" - - -// Enable EMOJI for JPN -#define CscFeatureTagWeb_EnableEmoji "CscFeature_Web_Bool_EnableEmoji" - -// Show Wifi AP List when WIFI switch is on (CMCC Requirement) -#define CscFeatureTagWeb_ShowWifiAPList "CscFeature_Web_ShowWifiAPList" - - // Enable Operator's toolbar (ATT Requirement) -#define CscFeatureTagWeb_EnableOperatorToolbar "CscFeature_Web_EnableOperatorToolbar" - -// Set TCP Connection timout (China Requirement) -#define CscFeatureTagWeb_SetTcpConnTimeoutAs "CscFeature_Web_SetTcpConnTimeoutAs" - -// Add WML mime type to Accept Header (CMCC Requirement) -#define CscFeatureTagWeb_AddWmlToHttpAcceptHeader4 "CscFeature_Web_AddWmlToHttpAcceptHeader4" - -// change block zoom method to position based touch block zoom (Australia Requirement) -#define CscFeature_Web_BlockZoomBaseOnTouchPosition "CscFeature_Web_BlockZoomBaseOnTouchPosition" - -// Remove Partial View During Horizontal Scroll in Nav Screen (Australia Requirement) -#define CscFeature_Web_RemovePartialViewDuringHorizontalScroll "CscFeature_Web_RemovePartialViewDuringHorizontalScroll" - -// Show Popup for MaxLength reached during Url input (CMCC Requirement) -#define CscFeatureTagWeb_EnablePopup4MaxLengthReachedDuringUrlInput "CscFeature_Web_EnablePopup4MaxLengthReachedDuringUrlInput" - -// Support Tel Number in the page to go to dialing app (KOR Requirement) -#define CscFeature_Web_RecognizeTelNumber "CscFeature_Web_RecognizeTelNumber" - -// Large file transfer in Internet download (VZW Requirement) -#define CscFeature_Web_EnableWifiOption4LargeFileDownload "CscFeature_Web_EnableWifiOption4LargeFileDownload" - -// Add additional accept charset to Accept Header (CTC Requirement) -#define CscFeature_Web_AddCharSetToHttpHeader "CscFeature_Web_AddCharSetToHttpHeader" - -// max connection per host for performance -#define CscFeature_Web_MaxConnectionPerHost "CscFeature_Web_MaxConnectionPerHost" -#endif // SEC_NATIVE_FEATURE_TAG_WEB_H diff --git a/rilsrc/libsecril-client/Android.mk b/rilsrc/libsecril-client/Android.mk deleted file mode 100755 index 5dcc0d4..0000000 --- a/rilsrc/libsecril-client/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2006 The Android Open Source Project - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES:= \ - secril-client.cpp - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_SHARED_LIBRARIES := \ - libutils \ - libbinder \ - libcutils \ - libhardware_legacy - -LOCAL_MODULE:= libsecril-client - -include $(BUILD_SHARED_LIBRARY) diff --git a/rilsrc/libsecril-client/secril-client.cpp b/rilsrc/libsecril-client/secril-client.cpp deleted file mode 100755 index cbf6ffb..0000000 --- a/rilsrc/libsecril-client/secril-client.cpp +++ /dev/null @@ -1,1570 +0,0 @@ -/** - * @file secril-client.cpp - * - * @author Myeongcheol Kim (mcmount.kim@samsung.com) - * - * @brief RIL client library for multi-client support - */ - -#define LOG_TAG "RILClient" -#define LOG_NDEBUG 0 - -#include <binder/Parcel.h> -#include <telephony/ril.h> -#include <cutils/record_stream.h> - -#include <unistd.h> -#include <errno.h> -#include <cutils/sockets.h> -#include <netinet/in.h> -#include <sys/types.h> -#include <string.h> -#include <fcntl.h> -#include <utils/Log.h> -#include <pthread.h> -#include "secril-client.h" -#include <hardware_legacy/power.h> // For wakelock - - -#define RIL_CLIENT_WAKE_LOCK "client-interface" - -namespace android { - -//--------------------------------------------------------------------------- -// Defines -//--------------------------------------------------------------------------- -#define DBG 1 -#define RILD_PORT 7777 -#define MULTI_CLIENT_SOCKET_NAME "Multiclient" -#define MULTI_CLIENT_Q_SOCKET_NAME "QMulticlient" -#if defined(SEC_PRODUCT_FEATURE_RIL_CALL_DUALMODE_CDMAGSM) -#define MULTI_CLIENT_SOCKET_NAME_2 "Multiclient2" -#endif - -#define MAX_COMMAND_BYTES (8 * 1024) -#define REQ_POOL_SIZE 32 -#define TOKEN_POOL_SIZE 32 - -// Constants for response types -#define RESPONSE_SOLICITED 0 -#define RESPONSE_UNSOLICITED 1 - -#define max(a, b) ((a) > (b) ? (a) : (b)) - -#define REQ_OEM_HOOK_RAW RIL_REQUEST_OEM_HOOK_RAW -#define REQ_SET_CALL_VOLUME 101 -#define REQ_SET_AUDIO_PATH 102 -#define REQ_SET_CALL_CLOCK_SYNC 103 -#define REQ_SET_CALL_RECORDING 104 -#define REQ_SET_CALL_MUTE 105 -#define REQ_GET_CALL_MUTE 106 -#define REQ_SET_CALL_VT_CTRL 107 -#define REQ_SET_TWO_MIC_CTRL 108 -#define REQ_SET_DHA_CTRL 109 -#define REQ_SET_LOOPBACK 110 - -// OEM request function ID -#define OEM_FUNC_SOUND 0x08 - -// OEM request sub function ID -#define OEM_SND_SET_VOLUME_CTRL 0x03 -#define OEM_SND_SET_AUDIO_PATH 0x05 -#define OEM_SND_GET_AUDIO_PATH 0x06 -#define OEM_SND_SET_VIDEO_CALL_CTRL 0x07 -#define OEM_SND_SET_LOOPBACK_CTRL 0x08 -#define OEM_SND_SET_VOICE_RECORDING_CTRL 0x09 -#define OEM_SND_SET_CLOCK_CTRL 0x0A -#define OEM_SND_SET_MUTE 0x0B -#define OEM_SND_GET_MUTE 0x0C -#define OEM_SND_SET_TWO_MIC_CTL 0x0D -#define OEM_SND_SET_DHA_CTL 0x0E - -#define OEM_SND_TYPE_VOICE 0x01 // Receiver(0x00) + Voice(0x01) -#define OEM_SND_TYPE_SPEAKER 0x11 // SpeakerPhone(0x10) + Voice(0x01) -#define OEM_SND_TYPE_HEADSET 0x31 // Headset(0x30) + Voice(0x01) -#define OEM_SND_TYPE_BTVOICE 0x41 // BT(0x40) + Voice(0x01) - -#define OEM_SND_AUDIO_PATH_HANDSET 0x01 -#define OEM_SND_AUDIO_PATH_HEADSET 0x02 -#define OEM_SND_AUDIO_PATH_HFK 0x03 -#define OEM_SND_AUDIO_PATH_BLUETOOTH 0x04 -#define OEM_SND_AUDIO_PATH_STEREO_BLUETOOTH 0x05 -#define OEM_SND_AUDIO_PATH_SPEAKER 0x06 -#define OEM_SND_AUDIO_PATH_HEADPHONE 0x07 -#define OEM_SND_AUDIO_PATH_BT_NSEC_OFF 0x08 -#define OEM_SND_AUDIO_PATH_MIC1 0x09 -#define OEM_SND_AUDIO_PATH_MIC2 0x0A -#define OEM_SND_AUDIO_PATH_BT_WB 0x0B -#define OEM_SND_AUDIO_PATH_BT_WB_NSEC_OFF 0x0C - -//--------------------------------------------------------------------------- -// Type definitions -//--------------------------------------------------------------------------- -typedef struct _ReqHistory { - int token; // token used for request - uint32_t id; // request ID -} ReqHistory; - -typedef struct _ReqRespHandler { - uint32_t id; // request ID - RilOnComplete handler; // handler function -} ReqRespHandler; - -typedef struct _UnsolHandler { - uint32_t id; // unsolicited response ID - RilOnUnsolicited handler; // handler function -} UnsolHandler; - -typedef struct _RilClientPrv { - HRilClient parent; - uint8_t b_connect; // connected to server? - int sock; // socket - int pipefd[2]; - fd_set sock_rfds; // for read with select() - RecordStream *p_rs; - uint32_t token_pool; // each bit in token_pool used for token. - // so, pool size is 32. - pthread_t tid_reader; // socket reader thread id - ReqHistory history[TOKEN_POOL_SIZE]; // request history - ReqRespHandler req_handlers[REQ_POOL_SIZE]; // request response handler list - UnsolHandler unsol_handlers[REQ_POOL_SIZE]; // unsolicited response handler list - RilOnError err_cb; // error callback - void *err_cb_data; // error callback data - uint8_t b_del_handler; -} RilClientPrv; - - -//--------------------------------------------------------------------------- -// Local static function prototypes -//--------------------------------------------------------------------------- -static void * RxReaderFunc(void *param); -static int processRxBuffer(RilClientPrv *prv, void *buffer, size_t buflen); -static uint32_t AllocateToken(uint32_t *token_pool); -static void FreeToken(uint32_t *token_pool, uint32_t token); -static uint8_t IsValidToken(uint32_t *token_pool, uint32_t token); -static void DeallocateToken(uint32_t *token_pool, uint32_t token); -static int blockingWrite(int fd, const void *buffer, size_t len); -static int RecordReqHistory(RilClientPrv *prv, int token, uint32_t id); -static void ClearReqHistory(RilClientPrv *prv, int token); -static RilOnComplete FindReqHandler(RilClientPrv *prv, int token, uint32_t *id); -static RilOnUnsolicited FindUnsolHandler(RilClientPrv *prv, uint32_t id); -static int SendOemRequestHookRaw(HRilClient client, int req_id, char *data, size_t len); -static bool isValidSoundType(SoundType type); -static bool isValidAudioPath(AudioPath path); -static bool isValidSoundClockCondition(SoundClockCondition condition); -static bool isValidCallRecCondition(CallRecCondition condition); -static bool isValidMuteCondition(MuteCondition condition); -static bool isValidTwoMicCtrl(TwoMicSolDevice device, TwoMicSolReport report); -static char ConvertSoundType(SoundType type); -static char ConvertAudioPath(AudioPath path); - - -/** - * @fn int RegisterUnsolicitedHandler(HRilClient client, uint32_t id, RilOnUnsolicited handler) - * - * @params client: Client handle. - * id: Unsolicited response ID to which handler is registered. - * handler: Unsolicited handler. NULL for deregistration. - * - * @return 0 on success or error code. - */ -extern "C" -int RegisterUnsolicitedHandler(HRilClient client, uint32_t id, RilOnUnsolicited handler) { - RilClientPrv *client_prv; - int match_slot = -1; - int first_empty_slot = -1; - int i; - - if (client == NULL || client->prv == NULL) - return RIL_CLIENT_ERR_INVAL; - - client_prv = (RilClientPrv *)(client->prv); - - for (i = 0; i < REQ_POOL_SIZE; i++) { - // Check if there is matched handler. - if (id == client_prv->unsol_handlers[i].id) { - match_slot = i; - } - // Find first empty handler slot. - if (first_empty_slot == -1 && client_prv->unsol_handlers[i].id == 0) { - first_empty_slot = i; - } - } - - if (handler == NULL) { // Unregister. - if (match_slot >= 0) { - memset(&(client_prv->unsol_handlers[match_slot]), 0, sizeof(UnsolHandler)); - return RIL_CLIENT_ERR_SUCCESS; - } - else { - return RIL_CLIENT_ERR_SUCCESS; - } - } - else {// Register. - if (match_slot >= 0) { - client_prv->unsol_handlers[match_slot].handler = handler; // Just update. - } - else if (first_empty_slot >= 0) { - client_prv->unsol_handlers[first_empty_slot].id = id; - client_prv->unsol_handlers[first_empty_slot].handler = handler; - } - else { - return RIL_CLIENT_ERR_RESOURCE; - } - } - - return RIL_CLIENT_ERR_SUCCESS; -} - - -/** - * @fn int RegisterRequestCompleteHandler(HRilClient client, uint32_t id, RilOnComplete handler) - * - * @params client: Client handle. - * id: Request ID to which handler is registered. - * handler: Request complete handler. NULL for deregistration. - * - * @return 0 on success or error code. - */ -extern "C" -int RegisterRequestCompleteHandler(HRilClient client, uint32_t id, RilOnComplete handler) { - RilClientPrv *client_prv; - int match_slot = -1; - int first_empty_slot = -1; - int i; - - if (client == NULL || client->prv == NULL) - return RIL_CLIENT_ERR_INVAL; - - client_prv = (RilClientPrv *)(client->prv); - - for (i = 0; i < REQ_POOL_SIZE; i++) { - // Check if there is matched handler. - if (id == client_prv->req_handlers[i].id) { - match_slot = i; - } - // Find first empty handler slot. - if (first_empty_slot == -1 && client_prv->req_handlers[i].id == 0) { - first_empty_slot = i; - } - } - - if (handler == NULL) { // Unregister. - if (match_slot >= 0) { - memset(&(client_prv->req_handlers[match_slot]), 0, sizeof(ReqRespHandler)); - return RIL_CLIENT_ERR_SUCCESS; - } - else { - return RIL_CLIENT_ERR_SUCCESS; - } - } - else { // Register. - if (match_slot >= 0) { - client_prv->req_handlers[match_slot].handler = handler; // Just update. - } - else if (first_empty_slot >= 0) { - client_prv->req_handlers[first_empty_slot].id = id; - client_prv->req_handlers[first_empty_slot].handler = handler; - } - else { - return RIL_CLIENT_ERR_RESOURCE; - } - } - - return RIL_CLIENT_ERR_SUCCESS; -} - - -/** - * @fn int RegisterErrorCallback(HRilClient client, RilOnError cb, void *data) - * - * @params client: Client handle. - * cb: Error callback. NULL for unregistration. - * data: Callback data. - * - * @return 0 for success or error code. - */ -extern "C" -int RegisterErrorCallback(HRilClient client, RilOnError cb, void *data) { - RilClientPrv *client_prv; - - if (client == NULL || client->prv == NULL) - return RIL_CLIENT_ERR_INVAL; - - client_prv = (RilClientPrv *)(client->prv); - - client_prv->err_cb = cb; - client_prv->err_cb_data = data; - - return RIL_CLIENT_ERR_SUCCESS; -} - - -/** - * @fn HRilClient OpenClient_RILD(void) - * - * @params None. - * - * @return Client handle, NULL on error. - */ -extern "C" -HRilClient OpenClient_RILD(void) { - HRilClient client = (HRilClient)malloc(sizeof(struct RilClient)); - if (client == NULL) - return NULL; - - client->prv = (RilClientPrv *)malloc(sizeof(RilClientPrv)); - if (client->prv == NULL) { - free(client); - return NULL; - } - - memset(client->prv, 0, sizeof(RilClientPrv)); - - ((RilClientPrv *)(client->prv))->parent = client; - ((RilClientPrv *)(client->prv))->sock = -1; - - return client; -} - - -/** - * @fn int Connect_RILD(void) - * - * @params client: Client handle. - * - * @return 0, or error code. - */ -extern "C" -int Connect_RILD(HRilClient client) { - RilClientPrv *client_prv; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - // Open client socket and connect to server. - //client_prv->sock = socket_loopback_client(RILD_PORT, SOCK_STREAM); - client_prv->sock = socket_local_client(MULTI_CLIENT_SOCKET_NAME, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM ); - - if (client_prv->sock < 0) { - ALOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_CONNECT; - } - - client_prv->b_connect = 1; - - if (fcntl(client_prv->sock, F_SETFL, O_NONBLOCK) < 0) { - close(client_prv->sock); - return RIL_CLIENT_ERR_IO; - } - - client_prv->p_rs = record_stream_new(client_prv->sock, MAX_COMMAND_BYTES); - - if (pipe(client_prv->pipefd) < 0) { - close(client_prv->sock); - ALOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_IO; - } - - if (fcntl(client_prv->pipefd[0], F_SETFL, O_NONBLOCK) < 0) { - close(client_prv->sock); - close(client_prv->pipefd[0]); - close(client_prv->pipefd[1]); - return RIL_CLIENT_ERR_IO; - } - - // Start socket read thread. - if (pthread_create(&(client_prv->tid_reader), NULL, RxReaderFunc, (void *)client_prv) != 0) { - close(client_prv->sock); - close(client_prv->pipefd[0]); - close(client_prv->pipefd[1]); - - memset(client_prv, 0, sizeof(RilClientPrv)); - client_prv->sock = -1; - ALOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_CONNECT; - } - - return RIL_CLIENT_ERR_SUCCESS; -} - -/** - * @fn int Connect_QRILD(void) - * - * @params client: Client handle. - * - * @return 0, or error code. - */ -extern "C" -int Connect_QRILD(HRilClient client) { - RilClientPrv *client_prv; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - // Open client socket and connect to server. - //client_prv->sock = socket_loopback_client(RILD_PORT, SOCK_STREAM); - client_prv->sock = socket_local_client(MULTI_CLIENT_Q_SOCKET_NAME, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM ); - - if (client_prv->sock < 0) { - ALOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_CONNECT; - } - - client_prv->b_connect = 1; - - if (fcntl(client_prv->sock, F_SETFL, O_NONBLOCK) < 0) { - close(client_prv->sock); - return RIL_CLIENT_ERR_IO; - } - - client_prv->p_rs = record_stream_new(client_prv->sock, MAX_COMMAND_BYTES); - - if (pipe(client_prv->pipefd) < 0) { - close(client_prv->sock); - ALOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_IO; - } - - if (fcntl(client_prv->pipefd[0], F_SETFL, O_NONBLOCK) < 0) { - close(client_prv->sock); - close(client_prv->pipefd[0]); - close(client_prv->pipefd[1]); - return RIL_CLIENT_ERR_IO; - } - - // Start socket read thread. - if (pthread_create(&(client_prv->tid_reader), NULL, RxReaderFunc, (void *)client_prv) != 0) { - close(client_prv->sock); - close(client_prv->pipefd[0]); - close(client_prv->pipefd[1]); - - memset(client_prv, 0, sizeof(RilClientPrv)); - client_prv->sock = -1; - ALOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_CONNECT; - } - - return RIL_CLIENT_ERR_SUCCESS; -} - -#if defined(SEC_PRODUCT_FEATURE_RIL_CALL_DUALMODE_CDMAGSM) // mook_120209 Enable multiclient -/** - * @fn int Connect_RILD_Second(void) - * - * @params client: Client handle. - * - * @return 0, or error code. - */ -extern "C" -int Connect_RILD_Second(HRilClient client) { - RilClientPrv *client_prv; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - // Open client socket and connect to server. - //client_prv->sock = socket_loopback_client(RILD_PORT, SOCK_STREAM); - client_prv->sock = socket_local_client(MULTI_CLIENT_SOCKET_NAME_2, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM ); - - if (client_prv->sock < 0) { - ALOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_CONNECT; - } - - client_prv->b_connect = 1; - - if (fcntl(client_prv->sock, F_SETFL, O_NONBLOCK) < 0) { - close(client_prv->sock); - return RIL_CLIENT_ERR_IO; - } - - client_prv->p_rs = record_stream_new(client_prv->sock, MAX_COMMAND_BYTES); - - if (pipe(client_prv->pipefd) < 0) { - close(client_prv->sock); - ALOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_IO; - } - - if (fcntl(client_prv->pipefd[0], F_SETFL, O_NONBLOCK) < 0) { - close(client_prv->sock); - close(client_prv->pipefd[0]); - close(client_prv->pipefd[1]); - return RIL_CLIENT_ERR_IO; - } - - // Start socket read thread. - if (pthread_create(&(client_prv->tid_reader), NULL, RxReaderFunc, (void *)client_prv) != 0) { - close(client_prv->sock); - close(client_prv->pipefd[0]); - close(client_prv->pipefd[1]); - - memset(client_prv, 0, sizeof(RilClientPrv)); - client_prv->sock = -1; - ALOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno); - return RIL_CLIENT_ERR_CONNECT; - } - - return RIL_CLIENT_ERR_SUCCESS; -} -#endif - -/** - * @fn int isConnected_RILD(HRilClient client) - * - * @params client: Client handle. - * - * @return 0, or 1. - */ -extern "C" -int isConnected_RILD(HRilClient client) { - RilClientPrv *client_prv; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - return client_prv->b_connect == 1; -} - -/** - * @fn int Disconnect_RILD(HRilClient client) - * - * @params client: Client handle. - * - * @return 0 on success, or error code. - */ -extern "C" -int Disconnect_RILD(HRilClient client) { - RilClientPrv *client_prv; - int ret = 0; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock == -1) - return RIL_CLIENT_ERR_SUCCESS; - - printf("[*] %s(): sock=%d\n", __FUNCTION__, client_prv->sock); - - if (client_prv->sock > 0) { - do { - ret = write(client_prv->pipefd[1], "close", strlen("close")); - } while (ret < 0 && errno == EINTR); - } - - client_prv->b_connect = 0; - - pthread_join(client_prv->tid_reader, NULL); - - return RIL_CLIENT_ERR_SUCCESS; -} - - -/** - * @fn int CloseClient_RILD(HRilClient client) - * - * @params client: Client handle. - * - * @return 0 on success, or error code. - */ -extern "C" -int CloseClient_RILD(HRilClient client) { - if (client == NULL || client->prv == NULL) { - ALOGE("%s: invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - Disconnect_RILD(client); - - free(client->prv); - free(client); - - return RIL_CLIENT_ERR_SUCCESS; -} - - -/** - * Set in-call volume. - */ -extern "C" -int SetCallVolume(HRilClient client, SoundType type, int vol_level) { - RilClientPrv *client_prv; - int ret; - char data[6] = {0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - if (isValidSoundType(type) == false) { - ALOGE("%s: Invalid sound type", __FUNCTION__); - return RIL_CLIENT_ERR_INVAL; - } - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_VOLUME_CTRL; - data[2] = 0x00; // data length - data[3] = 0x06; // data length - data[4] = ConvertSoundType(type); // volume type - data[5] = vol_level; // volume level - - RegisterRequestCompleteHandler(client, REQ_SET_CALL_VOLUME, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_CALL_VOLUME, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_CALL_VOLUME, NULL); - } - - return ret; -} - - -/** - * Set external sound device path for noise reduction. - */ -extern "C" -int SetCallAudioPath(HRilClient client, AudioPath path) -{ - RilClientPrv *client_prv; - int ret; - char data[6] = {0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - if (isValidAudioPath(path) == false) { - ALOGE("%s: Invalid audio path", __FUNCTION__); - return RIL_CLIENT_ERR_INVAL; - } - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_AUDIO_PATH; - data[2] = 0x00; // data length - data[3] = 0x06; // data length - data[4] = ConvertAudioPath(path); // audio path - - RegisterRequestCompleteHandler(client, REQ_SET_AUDIO_PATH, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_AUDIO_PATH, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_AUDIO_PATH, NULL); - } - - return ret; -} - - -/** - * Set modem clock to master or slave. - */ -extern "C" -int SetCallClockSync(HRilClient client, SoundClockCondition condition) { - RilClientPrv *client_prv; - int ret; - char data[5] = {0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - if (isValidSoundClockCondition(condition) == false) { - ALOGE("%s: Invalid sound clock condition", __FUNCTION__); - return RIL_CLIENT_ERR_INVAL; - } - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_CLOCK_CTRL; - data[2] = 0x00; // data length - data[3] = 0x05; // data length - data[4] = condition; - - RegisterRequestCompleteHandler(client, REQ_SET_CALL_CLOCK_SYNC, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_CALL_CLOCK_SYNC, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_CALL_CLOCK_SYNC, NULL); - } - - return ret; -} - -/** - * Set modem VTCall clock to master or slave. - */ -extern "C" -int SetVideoCallClockSync(HRilClient client, SoundClockCondition condition) { - RilClientPrv *client_prv; - int ret; - char data[5] = {0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - if (isValidSoundClockCondition(condition) == false) { - ALOGE("%s: Invalid sound clock condition", __FUNCTION__); - return RIL_CLIENT_ERR_INVAL; - } - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_VIDEO_CALL_CTRL; - data[2] = 0x00; // data length - data[3] = 0x05; // data length - data[4] = condition; - - RegisterRequestCompleteHandler(client, REQ_SET_CALL_VT_CTRL, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_CALL_VT_CTRL, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_CALL_VT_CTRL, NULL); - } - - return ret; -} - -/** - * Set voice recording. - */ -extern "C" -int SetCallRecord(HRilClient client, CallRecCondition condition) { - RilClientPrv *client_prv; - int ret; - char data[5] = {0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - if (isValidCallRecCondition(condition) == false) { - ALOGE("%s: Invalid sound clock condition", __FUNCTION__); - return RIL_CLIENT_ERR_INVAL; - } - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_VOICE_RECORDING_CTRL; - data[2] = 0x00; // data length - data[3] = 0x05; // data length - data[4] = condition; - - RegisterRequestCompleteHandler(client, REQ_SET_CALL_RECORDING, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_CALL_RECORDING, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_CALL_RECORDING, NULL); - } - - return ret; -} - -/** - * Set mute or unmute. - */ -extern "C" -int SetMute(HRilClient client, MuteCondition condition) { - RilClientPrv *client_prv; - int ret; - char data[5] = {0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - if (isValidMuteCondition(condition) == false) { - ALOGE("%s: Invalid sound clock condition", __FUNCTION__); - return RIL_CLIENT_ERR_INVAL; - } - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_MUTE; - data[2] = 0x00; // data length - data[3] = 0x05; // data length - data[4] = condition; - - RegisterRequestCompleteHandler(client, REQ_SET_CALL_MUTE, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_CALL_MUTE, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_CALL_MUTE, NULL); - } - - return ret; -} - -/** - * Get mute state. - */ -extern "C" -int GetMute(HRilClient client, RilOnComplete handler) { - RilClientPrv *client_prv; - int ret; - char data[4] = {0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - client_prv->b_del_handler = 1; - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_GET_MUTE; - data[2] = 0x00; // data length - data[3] = 0x04; // data length - - RegisterRequestCompleteHandler(client, REQ_GET_CALL_MUTE, handler); - - ret = SendOemRequestHookRaw(client, REQ_GET_CALL_MUTE, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_GET_CALL_MUTE, NULL); - } - - return ret; -} - -extern "C" -int SetTwoMicControl(HRilClient client, TwoMicSolDevice device, TwoMicSolReport report) { - RilClientPrv *client_prv; - int ret; - char data[6] = {0,}; - - ALOGE(" + %s", __FUNCTION__); - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - if (isValidTwoMicCtrl(device, report) == false) { - ALOGE("%s: Invalid sound set two params", __FUNCTION__); - return RIL_CLIENT_ERR_INVAL; - } - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_TWO_MIC_CTL; - data[2] = 0x00; // data length - data[3] = 0x06; // data length - data[4] = device; - data[5] = report; - - RegisterRequestCompleteHandler(client, REQ_SET_TWO_MIC_CTRL, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_TWO_MIC_CTRL, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_TWO_MIC_CTRL, NULL); - } - - ALOGE(" - %s", __FUNCTION__); - - return ret; -} - -extern "C" -int SetDhaSolution(HRilClient client, DhaSolMode mode, DhaSolSelect select, char *parameter) { - RilClientPrv *client_prv; - int ret; - char data[30] = {0,}; - char tempPara[24]={0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - ALOGE("%s: DHA mode=%d, select=%d", __FUNCTION__,mode, select); - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_DHA_CTL; - data[2] = 0x00; // data length - data[3] = 0x1E; // data length - data[4] = mode; - data[5] = select; - - memcpy(tempPara, parameter, 24); - for(int i=0; i<24; i++) - data[6+i]= tempPara[i]; - - RegisterRequestCompleteHandler(client, REQ_SET_DHA_CTRL, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_DHA_CTRL, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_DHA_CTRL, NULL); - } - - return ret; -} - -/** - * Set LoopbackTest mode, path. - */ -extern "C" -int SetLoopbackTest(HRilClient client, LoopbackMode mode, AudioPath path) { - RilClientPrv *client_prv; - int ret; - char data[6] = {0,}; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - // Make raw data - data[0] = OEM_FUNC_SOUND; - data[1] = OEM_SND_SET_LOOPBACK_CTRL; - data[2] = 0x00; // data length - data[3] = 0x06; // data length - data[4] = mode; // Loopback Mode - data[5] = ConvertAudioPath(path); // Loopback path - - RegisterRequestCompleteHandler(client, REQ_SET_LOOPBACK, NULL); - - ret = SendOemRequestHookRaw(client, REQ_SET_LOOPBACK, data, sizeof(data)); - if (ret != RIL_CLIENT_ERR_SUCCESS) { - RegisterRequestCompleteHandler(client, REQ_SET_LOOPBACK, NULL); - } - - return ret; -} - - -/** - * @fn int InvokeOemRequestHookRaw(HRilClient client, char *data, size_t len) - * - * @params client: Client handle. - * data: Request data. - * len: Request data length. - * - * @return 0 for success or error code. On receiving RIL_CLIENT_ERR_AGAIN, - * caller should retry. - */ -extern "C" -int InvokeOemRequestHookRaw(HRilClient client, char *data, size_t len) { - RilClientPrv *client_prv; - - if (client == NULL || client->prv == NULL) { - ALOGE("%s: Invalid client %p", __FUNCTION__, client); - return RIL_CLIENT_ERR_INVAL; - } - - client_prv = (RilClientPrv *)(client->prv); - - if (client_prv->sock < 0 ) { - ALOGE("%s: Not connected.", __FUNCTION__); - return RIL_CLIENT_ERR_CONNECT; - } - - return SendOemRequestHookRaw(client, REQ_OEM_HOOK_RAW, data, len); -} - - -static int SendOemRequestHookRaw(HRilClient client, int req_id, char *data, size_t len) { - int token = 0; - int ret = 0; - uint32_t header = 0; - android::Parcel p; - RilClientPrv *client_prv; - int maxfd = -1; - - client_prv = (RilClientPrv *)(client->prv); - - // Allocate a token. - token = AllocateToken(&(client_prv->token_pool)); - if (token == 0) { - ALOGE("%s: No token.", __FUNCTION__); - return RIL_CLIENT_ERR_AGAIN; - } - - // Record token for the request sent. - if (RecordReqHistory(client_prv, token, req_id) != RIL_CLIENT_ERR_SUCCESS) { - goto error; - } - - // Make OEM request data. - p.writeInt32(RIL_REQUEST_OEM_HOOK_RAW); - p.writeInt32(token); - p.writeInt32(len); - p.write((void *)data, len); - - // DO TX: header(size). - header = htonl(p.dataSize()); - - if (DBG) ALOGD("%s(): token = %d\n", __FUNCTION__, token); - - ret = blockingWrite(client_prv->sock, (void *)&header, sizeof(header)); - if (ret < 0) { - ALOGE("%s: send request header failed. (%d)", __FUNCTION__, ret); - goto error; - } - - // Do TX: response data. - ret = blockingWrite(client_prv->sock, p.data(), p.dataSize()); - if (ret < 0) { - ALOGE("%s: send request data failed. (%d)", __FUNCTION__, ret); - goto error; - } - - return RIL_CLIENT_ERR_SUCCESS; - -error: - FreeToken(&(client_prv->token_pool), token); - ClearReqHistory(client_prv, token); - - return RIL_CLIENT_ERR_UNKNOWN; -} - - -static bool isValidSoundType(SoundType type) { - return (type >= SOUND_TYPE_VOICE && type <= SOUND_TYPE_BTVOICE); -} - - -static bool isValidAudioPath(AudioPath path) { - return (path >= SOUND_AUDIO_PATH_HANDSET && path <= OEM_SND_AUDIO_PATH_BT_WB_NSEC_OFF); -} - - -static bool isValidSoundClockCondition(SoundClockCondition condition) { - return (condition >= SOUND_CLOCK_STOP && condition <= SOUND_CLOCK_START); -} - -static bool isValidCallRecCondition(CallRecCondition condition) { - return (condition >= CALL_REC_STOP && condition <= CALL_REC_START); -} - -static bool isValidMuteCondition(MuteCondition condition) { - return (condition >= TX_UNMUTE && condition <= RXTX_MUTE); -} - -static bool isValidTwoMicCtrl(TwoMicSolDevice device, TwoMicSolReport report) { - return (device >= AUDIENCE && device <= FORTEMEDIA && report >= TWO_MIC_SOLUTION_OFF && report <= TWO_MIC_SOLUTION_ON ); -} - - -static char ConvertSoundType(SoundType type) { - switch (type) { - case SOUND_TYPE_VOICE: - return OEM_SND_TYPE_VOICE; - case SOUND_TYPE_SPEAKER: - return OEM_SND_TYPE_SPEAKER; - case SOUND_TYPE_HEADSET: - return OEM_SND_TYPE_HEADSET; - case SOUND_TYPE_BTVOICE: - return OEM_SND_TYPE_BTVOICE; - default: - return OEM_SND_TYPE_VOICE; - } -} - - -static char ConvertAudioPath(AudioPath path) { - switch (path) { - case SOUND_AUDIO_PATH_HANDSET: - return OEM_SND_AUDIO_PATH_HANDSET; - case SOUND_AUDIO_PATH_HEADSET: - return OEM_SND_AUDIO_PATH_HEADSET; - case SOUND_AUDIO_PATH_SPEAKER: - return OEM_SND_AUDIO_PATH_SPEAKER; - case SOUND_AUDIO_PATH_BLUETOOTH: - return OEM_SND_AUDIO_PATH_BLUETOOTH; - case SOUND_AUDIO_PATH_STEREO_BT: - return OEM_SND_AUDIO_PATH_STEREO_BLUETOOTH; - case SOUND_AUDIO_PATH_HEADPHONE: - return OEM_SND_AUDIO_PATH_HEADPHONE; - case SOUND_AUDIO_PATH_BLUETOOTH_NO_NR: - return OEM_SND_AUDIO_PATH_BT_NSEC_OFF; - case SOUND_AUDIO_PATH_MIC1: - return OEM_SND_AUDIO_PATH_MIC1; - case SOUND_AUDIO_PATH_MIC2: - return OEM_SND_AUDIO_PATH_MIC2; - case SOUND_AUDIO_PATH_BLUETOOTH_WB: - return OEM_SND_AUDIO_PATH_BT_WB; - case SOUND_AUDIO_PATH_BLUETOOTH_WB_NO_NR: - return OEM_SND_AUDIO_PATH_BT_WB_NSEC_OFF; - - default: - return OEM_SND_AUDIO_PATH_HANDSET; - } -} - - -static void * RxReaderFunc(void *param) { - RilClientPrv *client_prv = (RilClientPrv *)param; - int maxfd = 0; - int token = 0; - void *p_record = NULL; - size_t recordlen = 0; - int ret = 0; - int n; - - if (client_prv == NULL) - return NULL; - - maxfd = max(client_prv->sock, client_prv->pipefd[0]) + 1; - - printf("[*] %s() b_connect=%d, maxfd=%d\n", __FUNCTION__, client_prv->b_connect, maxfd); - while (client_prv->b_connect) { - FD_ZERO(&(client_prv->sock_rfds)); - - FD_SET(client_prv->sock, &(client_prv->sock_rfds)); - FD_SET(client_prv->pipefd[0], &(client_prv->sock_rfds)); - - if (DBG) ALOGD("[*] %s() b_connect=%d\n", __FUNCTION__, client_prv->b_connect); - if (select(maxfd, &(client_prv->sock_rfds), NULL, NULL, NULL) > 0) { - if (FD_ISSET(client_prv->sock, &(client_prv->sock_rfds))) { - // Read incoming data - for (;;) { - // loop until EAGAIN/EINTR, end of stream, or other error - ret = record_stream_get_next(client_prv->p_rs, &p_record, &recordlen); - if (ret == 0 && p_record == NULL) { // end-of-stream - break; - } - else if (ret < 0) { - break; - } - else if (ret == 0) { // && p_record != NULL - n = processRxBuffer(client_prv, p_record, recordlen); - if (n != RIL_CLIENT_ERR_SUCCESS) { - ALOGE("%s: processRXBuffer returns %d", __FUNCTION__, n); - } - } - else { - printf("[*] %s()\n", __FUNCTION__); - } - } - - if (ret == 0 || !(errno == EAGAIN || errno == EINTR)) { - // fatal error or end-of-stream - if (client_prv->sock > 0) { - close(client_prv->sock); - client_prv->sock = -1; - client_prv->b_connect = 0; - } - - if (client_prv->p_rs) - record_stream_free(client_prv->p_rs); - - // EOS - if (client_prv->err_cb) { - client_prv->err_cb(client_prv->err_cb_data, RIL_CLIENT_ERR_CONNECT); - return NULL; - } - - break; - } - } - if (FD_ISSET(client_prv->pipefd[0], &(client_prv->sock_rfds))) { - char end_cmd[10]; - - if (DBG) ALOGD("%s(): close\n", __FUNCTION__); - - if (read(client_prv->pipefd[0], end_cmd, sizeof(end_cmd)) > 0) { - close(client_prv->sock); - close(client_prv->pipefd[0]); - close(client_prv->pipefd[1]); - - client_prv->sock = -1; - client_prv->b_connect = 0; - } - } - } - } - - return NULL; -} - - -static int processUnsolicited(RilClientPrv *prv, Parcel &p) { - int32_t resp_id, len; - status_t status; - const void *data = NULL; - RilOnUnsolicited unsol_func = NULL; - - status = p.readInt32(&resp_id); - if (status != NO_ERROR) { - ALOGE("%s: read resp_id failed.", __FUNCTION__); - return RIL_CLIENT_ERR_IO; - } - - status = p.readInt32(&len); - if (status != NO_ERROR) { - //ALOGE("%s: read length failed. assume zero length.", __FUNCTION__); - len = 0; - } - - ALOGD("%s(): resp_id (%d), len(%d)\n", __FUNCTION__, resp_id, len); - - if (len) - data = p.readInplace(len); - - // Find unsolicited response handler. - unsol_func = FindUnsolHandler(prv, (uint32_t)resp_id); - if (unsol_func) { - unsol_func(prv->parent, data, len); - } - - return RIL_CLIENT_ERR_SUCCESS; -} - - -static int processSolicited(RilClientPrv *prv, Parcel &p) { - int32_t token, err, len; - status_t status; - const void *data = NULL; - RilOnComplete req_func = NULL; - int ret = RIL_CLIENT_ERR_SUCCESS; - uint32_t req_id = 0; - - if (DBG) ALOGD("%s()", __FUNCTION__); - - status = p.readInt32(&token); - if (status != NO_ERROR) { - ALOGE("%s: Read token fail. Status %d\n", __FUNCTION__, status); - return RIL_CLIENT_ERR_IO; - } - - if (IsValidToken(&(prv->token_pool), token) == 0) { - ALOGE("%s: Invalid Token", __FUNCTION__); - return RIL_CLIENT_ERR_INVAL; // Invalid token. - } - - status = p.readInt32(&err); - if (status != NO_ERROR) { - ALOGE("%s: Read err fail. Status %d\n", __FUNCTION__, status); - ret = RIL_CLIENT_ERR_IO; - goto error; - } - - // Don't go further for error response. - if (err != RIL_CLIENT_ERR_SUCCESS) { - ALOGE("%s: Error %d\n", __FUNCTION__, err); - if (prv->err_cb) - prv->err_cb(prv->err_cb_data, err); - ret = RIL_CLIENT_ERR_SUCCESS; - goto error; - } - - status = p.readInt32(&len); - if (status != NO_ERROR) { - /* no length field */ - len = 0; - } - - if (len) - data = p.readInplace(len); - - // Find request handler for the token. - // First, FindReqHandler() searches request history with the token - // and finds out a request ID. Then, it search request handler table - // with the request ID. - req_func = FindReqHandler(prv, token, &req_id); - if (req_func) - { - if (DBG) ALOGD("[*] Call handler"); - req_func(prv->parent, data, len); - - if(prv->b_del_handler) { - prv->b_del_handler = 0; - RegisterRequestCompleteHandler(prv->parent, req_id, NULL); - } - } else { - if (DBG) ALOGD("%s: No handler for token %d\n", __FUNCTION__, token); - } - -error: - FreeToken(&(prv->token_pool), token); - ClearReqHistory(prv, token); - return ret; -} - - -static int processRxBuffer(RilClientPrv *prv, void *buffer, size_t buflen) { - Parcel p; - int32_t response_type; - status_t status; - int ret = RIL_CLIENT_ERR_SUCCESS; - - acquire_wake_lock(PARTIAL_WAKE_LOCK, RIL_CLIENT_WAKE_LOCK); - - p.setData((uint8_t *)buffer, buflen); - - status = p.readInt32(&response_type); - if (DBG) ALOGD("%s: status %d response_type %d", __FUNCTION__, status, response_type); - - if (status != NO_ERROR) { - ret = RIL_CLIENT_ERR_IO; - goto EXIT; - } - - // FOr unsolicited response. - if (response_type == RESPONSE_UNSOLICITED) { - ret = processUnsolicited(prv, p); - } - // For solicited response. - else if (response_type == RESPONSE_SOLICITED) { - ret = processSolicited(prv, p); - if (ret != RIL_CLIENT_ERR_SUCCESS && prv->err_cb) { - prv->err_cb(prv->err_cb_data, ret); - } - } - else { - ret = RIL_CLIENT_ERR_INVAL; - } - -EXIT: - release_wake_lock(RIL_CLIENT_WAKE_LOCK); - return ret; -} - - -static uint32_t AllocateToken(uint32_t *token_pool) { - int i; - - // Token pool is full. - if (*token_pool == 0xFFFFFFFF) - return 0; - - for (i = 0; i < 32; i++) { - uint32_t new_token = 0x00000001 << i; - - if ((*token_pool & new_token) == 0) { - *token_pool |= new_token; - return new_token; - } - } - - return 0; -} - - -static void FreeToken(uint32_t *token_pool, uint32_t token) { - *token_pool &= ~token; -} - - -static uint8_t IsValidToken(uint32_t *token_pool, uint32_t token) { - if (token == 0) - return 0; - - if ((*token_pool & token) == token) - return 1; - else - return 0; -} - - -static int RecordReqHistory(RilClientPrv *prv, int token, uint32_t id) { - int i = 0; - - if (DBG) ALOGD("[*] %s(): token(%d), ID(%d)\n", __FUNCTION__, token, id); - for (i = 0; i < TOKEN_POOL_SIZE; i++) { - if (prv->history[i].token == 0) { - prv->history[i].token = token; - prv->history[i].id = id; - - if (DBG) ALOGD("[*] %s(): token(%d), ID(%d)\n", __FUNCTION__, token, id); - - return RIL_CLIENT_ERR_SUCCESS; - } - } - - ALOGE("%s: No free record for token %d", __FUNCTION__, token); - - return RIL_CLIENT_ERR_RESOURCE; -} - -static void ClearReqHistory(RilClientPrv *prv, int token) { - int i = 0; - - if (DBG) ALOGD("[*] %s(): token(%d)\n", __FUNCTION__, token); - for (i = 0; i < TOKEN_POOL_SIZE; i++) { - if (prv->history[i].token == token) { - memset(&(prv->history[i]), 0, sizeof(ReqHistory)); - break; - } - } -} - - -static RilOnUnsolicited FindUnsolHandler(RilClientPrv *prv, uint32_t id) { - int i; - - // Search unsolicited handler table. - for (i = 0; i < REQ_POOL_SIZE; i++) { - if (prv->unsol_handlers[i].id == id) - return prv->unsol_handlers[i].handler; - } - - return (RilOnUnsolicited)NULL; -} - - -static RilOnComplete FindReqHandler(RilClientPrv *prv, int token, uint32_t *id) { - int i = 0; - int j = 0; - - if (DBG) ALOGD("[*] %s(): token(%d)\n", __FUNCTION__, token); - - // Search request history. - for (i = 0; i < TOKEN_POOL_SIZE; i++) { - printf("[*] %s(): history_token(%d)\n", __FUNCTION__, prv->history[i].token); - if (prv->history[i].token == token) { - // Search request handler with request ID found. - for (j = 0; j < REQ_POOL_SIZE; j++) { - printf("[*] %s(): token(%d), req_id(%d), history_id(%d)\n", __FUNCTION__, token, prv->history[i].id, prv->history[i].id); - if (prv->req_handlers[j].id == prv->history[i].id) { - *id = prv->req_handlers[j].id; - return prv->req_handlers[j].handler; - } - } - } - } - - return NULL; -} - - -static void DeallocateToken(uint32_t *token_pool, uint32_t token) { - *token_pool &= !token; -} - - -static int blockingWrite(int fd, const void *buffer, size_t len) { - size_t writeOffset = 0; - const uint8_t *toWrite; - ssize_t written = 0; - - if (buffer == NULL) - return -1; - - toWrite = (const uint8_t *)buffer; - - while (writeOffset < len) { - do - { - written = write(fd, toWrite + writeOffset, len - writeOffset); - } while (written < 0 && errno == EINTR); - - if (written >= 0) { - writeOffset += written; - } - else { - ALOGE ("RIL Response: unexpected error on write errno:%d", errno); - printf("RIL Response: unexpected error on write errno:%d\n", errno); - close(fd); - return -1; - } - } - - return 0; -} - -} // namespace android - -// end of file - diff --git a/rilsrc/libsecril-client/secril-client.h b/rilsrc/libsecril-client/secril-client.h deleted file mode 100755 index 01ff89b..0000000 --- a/rilsrc/libsecril-client/secril-client.h +++ /dev/null @@ -1,285 +0,0 @@ -/** - * @file secril-client.h - * - * @author Myeongcheol Kim (mcmount.kim@samsung.com) - * - * @brief RIL client library for multi-client support - */ - -#ifndef __SECRIL_CLIENT_H__ -#define __SECRIL_CLIENT_H__ - -#include <sys/types.h> -//#include "SecProductFeature_RIL.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct RilClient { - void *prv; -}; - -typedef struct RilClient * HRilClient; - - -//--------------------------------------------------------------------------- -// Defines -//--------------------------------------------------------------------------- -#define RIL_CLIENT_ERR_SUCCESS 0 -#define RIL_CLIENT_ERR_AGAIN 1 -#define RIL_CLIENT_ERR_INIT 2 // Client is not initialized -#define RIL_CLIENT_ERR_INVAL 3 // Invalid value -#define RIL_CLIENT_ERR_CONNECT 4 // Connection error -#define RIL_CLIENT_ERR_IO 5 // IO error -#define RIL_CLIENT_ERR_RESOURCE 6 // Resource not available -#define RIL_CLIENT_ERR_UNKNOWN 7 - - -//--------------------------------------------------------------------------- -// Type definitions -//--------------------------------------------------------------------------- - -typedef int (*RilOnComplete)(HRilClient handle, const void *data, size_t datalen); - -typedef int (*RilOnUnsolicited)(HRilClient handle, const void *data, size_t datalen); - -typedef int (*RilOnError)(void *data, int error); - - -//--------------------------------------------------------------------------- -// Client APIs -//--------------------------------------------------------------------------- - -/** - * Open RILD multi-client. - * Return is client handle, NULL on error. - */ -HRilClient OpenClient_RILD(void); - -/** - * Stop RILD multi-client. If client socket was connected, - * it will be disconnected. - */ -int CloseClient_RILD(HRilClient client); - -/** - * Connect to RIL deamon. One client task starts. - * Return is 0 or error code. - */ -int Connect_RILD(HRilClient client); - -/** - * Connect to QRIL deamon. One client task starts. - * Return is 0 or error code. - */ -int Connect_QRILD(HRilClient client); - -#if defined(SEC_PRODUCT_FEATURE_RIL_CALL_DUALMODE_CDMAGSM) -/** - * Connect to RIL deamon. One client task starts. - * Return is 0 or error code. - */ -int Connect_RILD_Second(HRilClient client); -#endif -/** - * check whether RILD is connected - * Returns 0 or 1 - */ -int isConnected_RILD(HRilClient client); - -/** - * Disconnect connection to RIL deamon(socket close). - * Return is 0 or error code. - */ -int Disconnect_RILD(HRilClient client); - -/** - * Register unsolicited response handler. If handler is NULL, - * the handler for the request ID is unregistered. - * The response handler is invoked in the client task context. - * Return is 0 or error code. - */ -int RegisterUnsolicitedHandler(HRilClient client, uint32_t id, RilOnUnsolicited handler); - -/** - * Register solicited response handler. If handler is NULL, - * the handler for the ID is unregistered. - * The response handler is invoked in the client task context. - * Return is 0 or error code. - */ -int RegisterRequestCompleteHandler(HRilClient client, uint32_t id, RilOnComplete handler); - -/** - * Register error callback. If handler is NULL, - * the callback is unregistered. - * The response handler is invoked in the client task context. - * Return is 0 or error code. - */ -int RegisterErrorCallback(HRilClient client, RilOnError cb, void *data); - -/** - * Invoke OEM request. Request ID is RIL_REQUEST_OEM_HOOK_RAW. - * Return is 0 or error code. For RIL_CLIENT_ERR_AGAIN caller should retry. - */ -int InvokeOemRequestHookRaw(HRilClient client, char *data, size_t len); - -/** - * Sound device types. - */ -typedef enum _SoundType { - SOUND_TYPE_VOICE, - SOUND_TYPE_SPEAKER, - SOUND_TYPE_HEADSET, - SOUND_TYPE_BTVOICE -} SoundType; - -/** - * External sound device path. - */ -typedef enum _AudioPath { - SOUND_AUDIO_PATH_HANDSET, - SOUND_AUDIO_PATH_HEADSET, - SOUND_AUDIO_PATH_SPEAKER, - SOUND_AUDIO_PATH_BLUETOOTH, - SOUND_AUDIO_PATH_STEREO_BT, - SOUND_AUDIO_PATH_HEADPHONE, - SOUND_AUDIO_PATH_BLUETOOTH_NO_NR, - SOUND_AUDIO_PATH_MIC1, - SOUND_AUDIO_PATH_MIC2, - SOUND_AUDIO_PATH_BLUETOOTH_WB, - SOUND_AUDIO_PATH_BLUETOOTH_WB_NO_NR -} AudioPath; - -/** - * Clock adjustment parameters. - */ -typedef enum _SoundClockCondition { - SOUND_CLOCK_STOP, - SOUND_CLOCK_START -} SoundClockCondition; - -/** - * Call record adjustment parameters. - */ -typedef enum _CallRecCondition { - CALL_REC_STOP, - CALL_REC_START -} CallRecCondition; - -/** - * Mute adjustment parameters. - */ -typedef enum _MuteCondition { - TX_UNMUTE, /* 0x00: TX UnMute */ - TX_MUTE, /* 0x01: TX Mute */ - RX_UNMUTE, /* 0x02: RX UnMute */ - RX_MUTE, /* 0x03: RX Mute */ - RXTX_UNMUTE, /* 0x04: RXTX UnMute */ - RXTX_MUTE, /* 0x05: RXTX Mute */ -} MuteCondition; - -/** - * Two mic Solution control - * Two MIC Solution Device - */ -typedef enum __TwoMicSolDevice { - AUDIENCE, - FORTEMEDIA -} TwoMicSolDevice; - -/** - * Two MIC Solution Report - */ -typedef enum __TwoMicSolReport { - TWO_MIC_SOLUTION_OFF, - TWO_MIC_SOLUTION_ON -} TwoMicSolReport; - -/** - * DHA Mode - */ -typedef enum __DhaSolMode { - DHA_MODE_OFF, - DHA_MODE_ON -} DhaSolMode; - -/** - * DHA Select - */ -typedef enum __DhaSolSelect { - DHA_SEL_LEFT, - DHA_SEL_RIGHT -} DhaSolSelect; - -/** - * LoopbackTest parameters. - */ -typedef enum __LoopbackMode { - LOOPBACK_END, - LOOPBACK_ON_PCM, - LOOPBACK_ON_PACKET -} LoopbackMode; - -typedef enum __LoopbackPath { - RECEIVER, - EARPHONE, - LOUDSPEAKER -} LoopbackPath; - - -/** - * Set in-call volume. - */ -int SetCallVolume(HRilClient client, SoundType type, int vol_level); - -/** - * Set external sound device path for noise reduction. - */ -int SetCallAudioPath(HRilClient client, AudioPath path); - -/** - * Set modem clock to master or slave. - */ -int SetCallClockSync(HRilClient client, SoundClockCondition condition); - -/** - * Set modem vtcall clock to master or slave. - */ -int SetVideoCallClockSync(HRilClient client, SoundClockCondition condition); - -/** - * Set voice call record - */ -int SetCallRecord(HRilClient client, CallRecCondition condition); - -/** - * Set mute or unmute - */ -int SetMute(HRilClient client, MuteCondition condition); - -/** - * Get mute state - */ -int GetMute(HRilClient client, RilOnComplete handler); - -int SetTwoMicControl(HRilClient client, TwoMicSolDevice device, TwoMicSolReport report); - -/** - * DHA Solution Set - */ -int SetDhaSolution(HRilClient client, DhaSolMode mode, DhaSolSelect select, char *parameter); - -/** - * Set Loopback Test Mode and Path - */ -int SetLoopbackTest(HRilClient client, LoopbackMode mode, AudioPath path); - -#ifdef __cplusplus -}; -#endif - -#endif // __SECRIL_CLIENT_H__ - -// end of file - diff --git a/rilsrc/libsecril-compat/Android.mk b/rilsrc/libsecril-compat/Android.mk deleted file mode 100644 index ee6c91b..0000000 --- a/rilsrc/libsecril-compat/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := \ - secril-compat.c - -LOCAL_SHARED_LIBRARIES := \ - libhardware_legacy \ - libbinder - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_MODULE := libsecril-compat - -include $(BUILD_SHARED_LIBRARY) diff --git a/rilsrc/libsecril-compat/secril-compat.c b/rilsrc/libsecril-compat/secril-compat.c deleted file mode 100644 index fc11450..0000000 --- a/rilsrc/libsecril-compat/secril-compat.c +++ /dev/null @@ -1,13 +0,0 @@ -#include <sys/types.h> - -/** - * With the switch to C++11 by default, char16_t became a unique type, - * rather than basically just a typedef of uint16_t. As a result, the - * compiler now mangles the symbol for writeString16 differently. Our - * RIL references the old symbol of course, not the new one. - */ -uintptr_t _ZN7android6Parcel13writeString16EPKDsj(void *instance, void *str, size_t len); -uintptr_t _ZN7android6Parcel13writeString16EPKtj(void *instance, void *str, size_t len) -{ - return _ZN7android6Parcel13writeString16EPKDsj(instance, str, len); -} diff --git a/rilsrc/libsecril-shim/Android.mk b/rilsrc/libsecril-shim/Android.mk deleted file mode 100644 index 91519f2..0000000 --- a/rilsrc/libsecril-shim/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := \ - secril-shim.c - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libril \ - libcutils - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_MODULE := libsecril-shim - -include $(BUILD_SHARED_LIBRARY) diff --git a/rilsrc/libsecril-shim/secril-shim.c b/rilsrc/libsecril-shim/secril-shim.c deleted file mode 100644 index 0322a6e..0000000 --- a/rilsrc/libsecril-shim/secril-shim.c +++ /dev/null @@ -1,285 +0,0 @@ -#include "secril-shim.h" - -/* A copy of the original RIL function table. */ -static const RIL_RadioFunctions *origRilFunctions; - -/* A copy of the ril environment passed to RIL_Init. */ -static const struct RIL_Env *rilEnv; - -static void onRequestDial(int request, void *data, size_t datalen, RIL_Token t) { - RIL_Dial dial; - RIL_UUS_Info uusInfo; - - dial.address = ((RIL_Dial *) data)->address; - dial.clir = ((RIL_Dial *) data)->clir; - dial.uusInfo = ((RIL_Dial *) data)->uusInfo; - - if (dial.uusInfo == NULL) { - uusInfo.uusType = (RIL_UUS_Type) 0; - uusInfo.uusDcs = (RIL_UUS_DCS) 0; - uusInfo.uusData = NULL; - uusInfo.uusLength = 0; - dial.uusInfo = &uusInfo; - } - - origRilFunctions->onRequest(request, &dial, sizeof(dial), t); -} - -static void onRequestShim(int request, void *data, size_t datalen, RIL_Token t) -{ - switch (request) { - /* The Samsung RIL crashes if uusInfo is NULL... */ - case RIL_REQUEST_DIAL: - if (datalen == sizeof(RIL_Dial) && data != NULL) { - onRequestDial(request, data, datalen, t); - return; - } - break; - - /* Necessary; RILJ may fake this for us if we reply not supported, but we can just implement it. */ - case RIL_REQUEST_GET_RADIO_CAPABILITY: - ; /* lol C standard */ - RIL_RadioCapability rc[1] = - { - { /* rc[0] */ - RIL_RADIO_CAPABILITY_VERSION, /* version */ - 0, /* session */ - RC_PHASE_CONFIGURED, /* phase */ - RAF_GSM | RAF_GPRS | RAF_EDGE | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP | RAF_UMTS, /* rat */ - { /* logicalModemUuid */ - 0, - }, - RC_STATUS_SUCCESS /* status */ - } - }; - RLOGW("%s: got request %s: replied with our implementation!\n", __func__, requestToString(request)); - rilEnv->OnRequestComplete(t, RIL_E_SUCCESS, rc, sizeof(rc)); - return; - - /* The following requests were introduced post-4.3. */ - case RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC: - case RIL_REQUEST_SIM_OPEN_CHANNEL: /* !!! */ - case RIL_REQUEST_SIM_CLOSE_CHANNEL: - case RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL: - case RIL_REQUEST_NV_READ_ITEM: - case RIL_REQUEST_NV_WRITE_ITEM: - case RIL_REQUEST_NV_WRITE_CDMA_PRL: - case RIL_REQUEST_NV_RESET_CONFIG: - case RIL_REQUEST_SET_UICC_SUBSCRIPTION: - case RIL_REQUEST_ALLOW_DATA: - case RIL_REQUEST_GET_HARDWARE_CONFIG: - case RIL_REQUEST_SIM_AUTHENTICATION: - case RIL_REQUEST_GET_DC_RT_INFO: - case RIL_REQUEST_SET_DC_RT_INFO_RATE: - case RIL_REQUEST_SET_DATA_PROFILE: - case RIL_REQUEST_SHUTDOWN: /* TODO: Is there something we can do for RIL_REQUEST_SHUTDOWN ? */ - case RIL_REQUEST_SET_RADIO_CAPABILITY: - case RIL_REQUEST_START_LCE: - case RIL_REQUEST_STOP_LCE: - case RIL_REQUEST_PULL_LCEDATA: - RLOGW("%s: got request %s: replied with REQUEST_NOT_SUPPPORTED.\n", __func__, requestToString(request)); - rilEnv->OnRequestComplete(t, RIL_E_REQUEST_NOT_SUPPORTED, NULL, 0); - return; - } - - RLOGD("%s: got request %s: forwarded to RIL.\n", __func__, requestToString(request)); - origRilFunctions->onRequest(request, data, datalen, t); -} - -static void onCompleteRequestGetSimStatus(RIL_Token t, RIL_Errno e, void *response, size_t responselen) { - /* While at it, upgrade the response to RIL_CardStatus_v6 */ - RIL_CardStatus_v5_samsung *p_cur = ((RIL_CardStatus_v5_samsung *) response); - RIL_CardStatus_v6 v6response; - - v6response.card_state = p_cur->card_state; - v6response.universal_pin_state = p_cur->universal_pin_state; - v6response.gsm_umts_subscription_app_index = p_cur->gsm_umts_subscription_app_index; - v6response.cdma_subscription_app_index = p_cur->cdma_subscription_app_index; - v6response.ims_subscription_app_index = -1; - v6response.num_applications = p_cur->num_applications; - - int i; - for (i = 0; i < RIL_CARD_MAX_APPS; ++i) - memcpy(&v6response.applications[i], &p_cur->applications[i], sizeof(RIL_AppStatus)); - - /* Send the fixed response to libril */ - rilEnv->OnRequestComplete(t, e, &v6response, sizeof(RIL_CardStatus_v6)); -} - -static void fixupDataCallList(void *response, size_t responselen) { - RIL_Data_Call_Response_v6 *p_cur = (RIL_Data_Call_Response_v6 *) response; - int num = responselen / sizeof(RIL_Data_Call_Response_v6); - - int i; - for (i = 0; i < num; ++i) - p_cur[i].gateways = p_cur[i].addresses; -} - -static void onCompleteQueryAvailableNetworks(RIL_Token t, RIL_Errno e, void *response, size_t responselen) { - /* Response is a char **, pointing to an array of char *'s */ - size_t numStrings = responselen / sizeof(char *); - size_t newResponseLen = (numStrings - (numStrings / 3)) * sizeof(char *); - - void *newResponse = malloc(newResponseLen); - - /* Remove every 5th and 6th strings (qan elements) */ - char **p_cur = (char **) response; - char **p_new = (char **) newResponse; - size_t i, j; - for (i = 0, j = 0; i < numStrings; i += 6) { - p_new[j++] = p_cur[i]; - p_new[j++] = p_cur[i + 1]; - p_new[j++] = p_cur[i + 2]; - p_new[j++] = p_cur[i + 3]; - } - - /* Send the fixed response to libril */ - rilEnv->OnRequestComplete(t, e, newResponse, newResponseLen); - - free(newResponse); -} - -static void fixupSignalStrength(void *response, size_t responselen) { - int gsmSignalStrength; - - RIL_SignalStrength_v10 *p_cur = ((RIL_SignalStrength_v10 *) response); - - gsmSignalStrength = p_cur->GW_SignalStrength.signalStrength & 0xFF; - - if (gsmSignalStrength < 0 || - (gsmSignalStrength > 31 && p_cur->GW_SignalStrength.signalStrength != 99)) { - gsmSignalStrength = p_cur->CDMA_SignalStrength.dbm; - } - - /* Fix GSM signal strength */ - p_cur->GW_SignalStrength.signalStrength = gsmSignalStrength; - - /* We don't support LTE - values should be set to INT_MAX */ - p_cur->LTE_SignalStrength.cqi = INT_MAX; - p_cur->LTE_SignalStrength.rsrp = INT_MAX; - p_cur->LTE_SignalStrength.rsrq = INT_MAX; - p_cur->LTE_SignalStrength.rssnr = INT_MAX; -} - -static void onRequestCompleteShim(RIL_Token t, RIL_Errno e, void *response, size_t responselen) { - int request; - RequestInfo *pRI; - - pRI = (RequestInfo *)t; - - /* If pRI is null, this entire function is useless. */ - if (pRI == NULL) - goto null_token_exit; - - request = pRI->pCI->requestNumber; - - switch (request) { - case RIL_REQUEST_GET_SIM_STATUS: - /* Remove unused extra elements from RIL_AppStatus */ - if (response != NULL && responselen == sizeof(RIL_CardStatus_v5_samsung)) { - onCompleteRequestGetSimStatus(t, e, response, responselen); - return; - } - break; - case RIL_REQUEST_LAST_CALL_FAIL_CAUSE: - /* Remove extra element (ignored on pre-M, now crashing the framework) */ - if (responselen > sizeof(int)) { - rilEnv->OnRequestComplete(t, e, response, sizeof(int)); - return; - } - break; - case RIL_REQUEST_DATA_CALL_LIST: - case RIL_REQUEST_SETUP_DATA_CALL: - /* According to the Samsung RIL, the addresses are the gateways? - * This fixes mobile data. */ - if (response != NULL && responselen != 0 && (responselen % sizeof(RIL_Data_Call_Response_v6) == 0)) { - fixupDataCallList(response, responselen); - rilEnv->OnRequestComplete(t, e, response, responselen); - return; - } - break; - case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS: - /* Remove the extra (unused) elements from the operator info, freaking out the framework. - * Formerly, this is know as the mQANElements override. */ - if (response != NULL && responselen != 0 && (responselen % sizeof(char *) == 0)) { - onCompleteQueryAvailableNetworks(t, e, response, responselen); - return; - } - break; - case RIL_REQUEST_SIGNAL_STRENGTH: - /* The Samsung RIL reports the signal strength in a strange way... */ - if (response != NULL && responselen >= sizeof(RIL_SignalStrength_v5)) { - fixupSignalStrength(response, responselen); - rilEnv->OnRequestComplete(t, e, response, responselen); - return; - } - break; - } - - RLOGD("%s: got request %s: forwarded to libril.\n", __func__, requestToString(request)); -null_token_exit: - rilEnv->OnRequestComplete(t, e, response, responselen); -} - -static void onUnsolicitedResponseShim(int unsolResponse, const void *data, size_t datalen) -{ - switch (unsolResponse) { - case RIL_UNSOL_DATA_CALL_LIST_CHANGED: - /* According to the Samsung RIL, the addresses are the gateways? - * This fixes mobile data. */ - if (data != NULL && datalen != 0 && (datalen % sizeof(RIL_Data_Call_Response_v6) == 0)) - fixupDataCallList((void*) data, datalen); - break; - case RIL_UNSOL_SIGNAL_STRENGTH: - /* The Samsung RIL reports the signal strength in a strange way... */ - if (data != NULL && datalen >= sizeof(RIL_SignalStrength_v5)) - fixupSignalStrength((void*) data, datalen); - break; - } - - rilEnv->OnUnsolicitedResponse(unsolResponse, data, datalen); -} - -const RIL_RadioFunctions* RIL_Init(const struct RIL_Env *env, int argc, char **argv) -{ - RIL_RadioFunctions const* (*origRilInit)(const struct RIL_Env *env, int argc, char **argv); - static RIL_RadioFunctions shimmedFunctions; - static struct RIL_Env shimmedEnv; - void *origRil; - - /* Shim the RIL_Env passed to the real RIL, saving a copy of the original */ - rilEnv = env; - shimmedEnv = *env; - shimmedEnv.OnRequestComplete = onRequestCompleteShim; - shimmedEnv.OnUnsolicitedResponse = onUnsolicitedResponseShim; - - /* Open and Init the original RIL. */ - - origRil = dlopen(RIL_LIB_PATH, RTLD_LOCAL); - if (CC_UNLIKELY(!origRil)) { - RLOGE("%s: failed to load '" RIL_LIB_PATH "': %s\n", __func__, dlerror()); - return NULL; - } - - origRilInit = dlsym(origRil, "RIL_Init"); - if (CC_UNLIKELY(!origRilInit)) { - RLOGE("%s: couldn't find original RIL_Init!\n", __func__); - goto fail_after_dlopen; - } - - origRilFunctions = origRilInit(&shimmedEnv, argc, argv); - if (CC_UNLIKELY(!origRilFunctions)) { - RLOGE("%s: the original RIL_Init derped.\n", __func__); - goto fail_after_dlopen; - } - - /* Shim functions as needed. */ - shimmedFunctions = *origRilFunctions; - shimmedFunctions.onRequest = onRequestShim; - - return &shimmedFunctions; - -fail_after_dlopen: - dlclose(origRil); - return NULL; -} diff --git a/rilsrc/libsecril-shim/secril-shim.h b/rilsrc/libsecril-shim/secril-shim.h deleted file mode 100644 index 19ef464..0000000 --- a/rilsrc/libsecril-shim/secril-shim.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef __SECRIL_SHIM_H__ -#define __SECRIL_SHIM_H__ - -#define LOG_TAG "secril-shim" -#define RIL_SHLIB - -#include <dlfcn.h> -#include <inttypes.h> -#include <stdbool.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> - -#include <cutils/compiler.h> -#include <cutils/properties.h> -#include <sys/cdefs.h> -#include <telephony/ril.h> -#include <utils/Log.h> - -#define RIL_LIB_PATH "/vendor/lib/libsec-ril.so" - -extern const char * requestToString(int request); - -typedef struct -{ - RIL_AppType app_type; - RIL_AppState app_state; - RIL_PersoSubstate perso_substate; /* applicable only if app_state == - RIL_APPSTATE_SUBSCRIPTION_PERSO */ - char *aid_ptr; /* null terminated string, e.g., from 0xA0, 0x00 -> 0x41, - 0x30, 0x30, 0x30 */ - char *app_label_ptr; /* null terminated string */ - int pin1_replaced; /* applicable to USIM, CSIM & ISIM */ - RIL_PinState pin1; - RIL_PinState pin2; - int foo1; /* Samsung */ - int foo2; /* Samsung */ - int foo3; /* Samsung */ - int foo4; /* Samsung */ - int foo5; /* Samsung */ -} RIL_AppStatus_samsung; - -typedef struct -{ - RIL_CardState card_state; - RIL_PinState universal_pin_state; /* applicable to USIM and CSIM: RIL_PINSTATE_xxx */ - int gsm_umts_subscription_app_index; /* value < RIL_CARD_MAX_APPS, -1 if none */ - int cdma_subscription_app_index; /* value < RIL_CARD_MAX_APPS, -1 if none */ - int num_applications; /* value <= RIL_CARD_MAX_APPS */ - RIL_AppStatus_samsung applications[RIL_CARD_MAX_APPS]; -} RIL_CardStatus_v5_samsung; - -/* 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); -} CommandInfo; - -typedef struct RequestInfo { - int32_t token; - CommandInfo *pCI; - struct RequestInfo *p_next; - char cancelled; - char local; - RIL_SOCKET_ID socket_id; - int wasAckSent; -} RequestInfo; - -#endif /* __SECRIL_SHIM_H__ */ diff --git a/sepolicy/cpboot-daemon.te b/sepolicy/cpboot-daemon.te deleted file mode 100644 index 08281f4..0000000 --- a/sepolicy/cpboot-daemon.te +++ /dev/null @@ -1,13 +0,0 @@ -allow cpboot-daemon cbd_device:chr_file create_file_perms; -allow cpboot-daemon cgroup:dir { create add_name }; -allow cpboot-daemon device:dir { write add_name }; -allow cpboot-daemon efs_file:file { read write open }; -allow cpboot-daemon radio_device:blk_file r_file_perms; -allow cpboot-daemon radio_device:chr_file rw_file_perms; -allow cpboot-daemon self:capability setuid; -allow cpboot-daemon { block_device efs_file }:dir search; - -# Talk to init over the property socket -unix_socket_connect(cpboot-daemon, property, init) - -allow cpboot-daemon radio_prop:property_service set; diff --git a/sepolicy/domain.te b/sepolicy/domain.te deleted file mode 100644 index 2c6ccbb..0000000 --- a/sepolicy/domain.te +++ /dev/null @@ -1 +0,0 @@ -domain_trans(init, rootfs, cpboot-daemon) diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index bea6d0b..4ad5625 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -9,7 +9,6 @@ /dev/umts_rfs0 u:object_r:radio_device:s0 /dev/umts_router u:object_r:radio_device:s0 /dev/__cbd_msg_ u:object_r:cbd_device:s0 -/system/vendor/bin/cbd u:object_r:cpboot-daemon_exec:s0 # Radio Data /data/misc/radio(/.*)? u:object_r:radio_data:s0 diff --git a/sepolicy/init.te b/sepolicy/init.te deleted file mode 100644 index bc775a9..0000000 --- a/sepolicy/init.te +++ /dev/null @@ -1,2 +0,0 @@ -# Requied to load shim libs -allow init rild:process noatsecure; |