From 640eb97c4371224b8484b5028c5f035c191548a3 Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Sat, 5 Nov 2016 16:55:17 +1100 Subject: Remove unused proprietary RIL wrapping code. --- BoardCommonConfig.mk | 1 - common.mk | 5 - libsamsung_symbols/Android.mk | 28 -- libsamsung_symbols/samsung_ril.cpp | 21 - ril-wrapper/Android.mk | 9 - ril-wrapper/ril-wrapper.c | 99 ---- .../internal/telephony/SamsungExynos4RIL.java | 504 --------------------- rootdir/init.smdk4210.rc | 9 - selinux/cpboot-daemon.te | 23 - selinux/init.te | 1 - 10 files changed, 700 deletions(-) delete mode 100644 libsamsung_symbols/Android.mk delete mode 100644 libsamsung_symbols/samsung_ril.cpp delete mode 100644 ril-wrapper/Android.mk delete mode 100644 ril-wrapper/ril-wrapper.c delete mode 100644 ril/telephony/java/com/android/internal/telephony/SamsungExynos4RIL.java delete mode 100644 selinux/cpboot-daemon.te diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index e0b10eb..6bef87c 100644 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -111,7 +111,6 @@ TARGET_YAMAHA_MC1N2_AUDIO_DEVICE := galaxys2 # RIL BOARD_MODEM_TYPE := xmm6260 -BOARD_RIL_CLASS := ../../../device/samsung/galaxys2-common/ril COMMON_GLOBAL_CFLAGS += -DDISABLE_ASHMEM_TRACKING # Camera diff --git a/common.mk b/common.mk index 9d9b0a5..665e143 100644 --- a/common.mk +++ b/common.mk @@ -60,11 +60,6 @@ PRODUCT_PACKAGES := \ com.android.future.usb.accessory \ SamsungServiceMode -# Legacy RIL -PRODUCT_PACKAGES += \ - libsamsung_symbols \ - ril-wrapper - # Audio Packages PRODUCT_PACKAGES += \ AdvancedDisplay \ diff --git a/libsamsung_symbols/Android.mk b/libsamsung_symbols/Android.mk deleted file mode 100644 index c2e942e..0000000 --- a/libsamsung_symbols/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2015 The CyanogenMod 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 $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - samsung_ril.cpp - -LOCAL_SHARED_LIBRARIES := libbinder - -LOCAL_MODULE := libsamsung_symbols -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES - -include $(BUILD_SHARED_LIBRARY) diff --git a/libsamsung_symbols/samsung_ril.cpp b/libsamsung_symbols/samsung_ril.cpp deleted file mode 100644 index 404616d..0000000 --- a/libsamsung_symbols/samsung_ril.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod 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. - */ - -/* status_t Parcel::writeString16 */ -extern "C" int _ZN7android6Parcel13writeString16EPKDsj(); -extern "C" int _ZN7android6Parcel13writeString16EPKtj() { - return _ZN7android6Parcel13writeString16EPKDsj(); -} diff --git a/ril-wrapper/Android.mk b/ril-wrapper/Android.mk deleted file mode 100644 index 698e1d3..0000000 --- a/ril-wrapper/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= ril-wrapper.c -LOCAL_SHARED_LIBRARIES := liblog libbinder -LOCAL_MODULE:= ril-wrapper - -include $(BUILD_SHARED_LIBRARY) diff --git a/ril-wrapper/ril-wrapper.c b/ril-wrapper/ril-wrapper.c deleted file mode 100644 index 886cb34..0000000 --- a/ril-wrapper/ril-wrapper.c +++ /dev/null @@ -1,99 +0,0 @@ -#define LOG_TAG "RilWrapper" -#define RIL_SHLIB -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define REAL_RIL_NAME "/system/lib/libsec-ril.so" - - -static RIL_RadioFunctions const *mRealRadioFuncs; -static const struct RIL_Env *mEnv; - -static void rilOnRequest(int request, void *data, size_t datalen, RIL_Token t) -{ - switch (request) { - case RIL_REQUEST_GET_RADIO_CAPABILITY: - RLOGW("Returning NOT_SUPPORTED on GET_RADIO_CAPABILITY"); - mEnv->OnRequestComplete(t, RIL_E_REQUEST_NOT_SUPPORTED, NULL, 0); - break; - default: - mRealRadioFuncs->onRequest(request, data, datalen, t); - } -} - -const RIL_RadioFunctions* RIL_Init(const struct RIL_Env *env, int argc, char **argv) -{ - RIL_RadioFunctions const* (*fRealRilInit)(const struct RIL_Env *env, int argc, char **argv); - static RIL_RadioFunctions rilInfo; - void *realRilLibHandle; - int i; - - - //save the env; - mEnv = env; - - //get the real RIL - realRilLibHandle = dlopen(REAL_RIL_NAME, RTLD_LOCAL); - if (!realRilLibHandle) { - RLOGE("Failed to load the real RIL '" REAL_RIL_NAME "': %s\n", dlerror()); - return NULL; - } - - //remove "-c" command line as Samsung's RIL does not understand it - it just barfs instead - for (i = 0; i < argc; i++) { - if (!strcmp(argv[i], "-c") && i != argc -1) { //found it - memcpy(argv + i, argv + i + 2, sizeof(char*[argc - i - 2])); - argc -= 2; - } - } - - //load the real RIL - fRealRilInit = dlsym(realRilLibHandle, "RIL_Init"); - if (!fRealRilInit) { - RLOGE("Failed to find the real RIL's entry point\n"); - goto out_fail; - } - - RLOGD("Calling the real RIL's entry point with %u args\n", argc); - for (i = 0; i < argc; i++) - RLOGD(" argv[%2d] = '%s'\n", i, argv[i]); - - //try to init the real ril - mRealRadioFuncs = fRealRilInit(env, argc, argv); - if (!mRealRadioFuncs) { - RLOGE("The real RIL's entry point failed\n"); - goto out_fail; - } - - //copy the real RIL's info struct, then replace the onRequest pointer with our own - rilInfo = *mRealRadioFuncs; - rilInfo.onRequest = rilOnRequest; - - RLOGD("Wrapped RIL version is '%s'\n", mRealRadioFuncs->getVersion()); - - //we're all good - return to caller - return &rilInfo; - -out_fail: - dlclose(realRilLibHandle); - return NULL; -} diff --git a/ril/telephony/java/com/android/internal/telephony/SamsungExynos4RIL.java b/ril/telephony/java/com/android/internal/telephony/SamsungExynos4RIL.java deleted file mode 100644 index 5d4ccf6..0000000 --- a/ril/telephony/java/com/android/internal/telephony/SamsungExynos4RIL.java +++ /dev/null @@ -1,504 +0,0 @@ -/* - * Copyright (C) 2011 The CyanogenMod 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. - */ - -package com.android.internal.telephony; - -import static com.android.internal.telephony.RILConstants.*; - -import android.content.Context; -import android.os.AsyncResult; -import android.os.Handler; -import android.os.Message; -import android.os.Parcel; -import android.os.Registrant; -import android.telephony.ModemActivityInfo; -import android.telephony.Rlog; - -import android.telephony.PhoneNumberUtils; - -public class SamsungExynos4RIL extends RIL implements CommandsInterface { - - //SAMSUNG STATES - static final int RIL_REQUEST_GET_CELL_BROADCAST_CONFIG = 10002; - - static final int RIL_REQUEST_SEND_ENCODED_USSD = 10005; - static final int RIL_REQUEST_SET_PDA_MEMORY_STATUS = 10006; - static final int RIL_REQUEST_GET_PHONEBOOK_STORAGE_INFO = 10007; - static final int RIL_REQUEST_GET_PHONEBOOK_ENTRY = 10008; - static final int RIL_REQUEST_ACCESS_PHONEBOOK_ENTRY = 10009; - static final int RIL_REQUEST_DIAL_VIDEO_CALL = 10010; - static final int RIL_REQUEST_CALL_DEFLECTION = 10011; - static final int RIL_REQUEST_READ_SMS_FROM_SIM = 10012; - static final int RIL_REQUEST_USIM_PB_CAPA = 10013; - static final int RIL_REQUEST_LOCK_INFO = 10014; - - static final int RIL_REQUEST_DIAL_EMERGENCY = 10016; - static final int RIL_REQUEST_GET_STOREAD_MSG_COUNT = 10017; - static final int RIL_REQUEST_STK_SIM_INIT_EVENT = 10018; - static final int RIL_REQUEST_GET_LINE_ID = 10019; - static final int RIL_REQUEST_SET_LINE_ID = 10020; - static final int RIL_REQUEST_GET_SERIAL_NUMBER = 10021; - static final int RIL_REQUEST_GET_MANUFACTURE_DATE_NUMBER = 10022; - static final int RIL_REQUEST_GET_BARCODE_NUMBER = 10023; - static final int RIL_REQUEST_UICC_GBA_AUTHENTICATE_BOOTSTRAP = 10024; - static final int RIL_REQUEST_UICC_GBA_AUTHENTICATE_NAF = 10025; - static final int RIL_REQUEST_SIM_TRANSMIT_BASIC = 10026; - static final int RIL_REQUEST_SIM_OPEN_CHANNEL = 10027; - static final int RIL_REQUEST_SIM_CLOSE_CHANNEL = 10028; - static final int RIL_REQUEST_SIM_TRANSMIT_CHANNEL = 10029; - static final int RIL_REQUEST_SIM_AUTH = 10030; - static final int RIL_REQUEST_PS_ATTACH = 10031; - static final int RIL_REQUEST_PS_DETACH = 10032; - static final int RIL_REQUEST_ACTIVATE_DATA_CALL = 10033; - static final int RIL_REQUEST_CHANGE_SIM_PERSO = 10034; - static final int RIL_REQUEST_ENTER_SIM_PERSO = 10035; - static final int RIL_REQUEST_GET_TIME_INFO = 10036; - static final int RIL_REQUEST_OMADM_SETUP_SESSION = 10037; - static final int RIL_REQUEST_OMADM_SERVER_START_SESSION = 10038; - static final int RIL_REQUEST_OMADM_CLIENT_START_SESSION = 10039; - static final int RIL_REQUEST_OMADM_SEND_DATA = 10040; - static final int RIL_REQUEST_CDMA_GET_DATAPROFILE = 10041; - static final int RIL_REQUEST_CDMA_SET_DATAPROFILE = 10042; - static final int RIL_REQUEST_CDMA_GET_SYSTEMPROPERTIES = 10043; - static final int RIL_REQUEST_CDMA_SET_SYSTEMPROPERTIES = 10044; - static final int RIL_REQUEST_SEND_SMS_COUNT = 10045; - static final int RIL_REQUEST_SEND_SMS_MSG = 10046; - static final int RIL_REQUEST_SEND_SMS_MSG_READ_STATUS = 10047; - static final int RIL_REQUEST_MODEM_HANGUP = 10048; - static final int RIL_REQUEST_SET_SIM_POWER = 10049; - static final int RIL_REQUEST_SET_PREFERRED_NETWORK_LIST = 10050; - static final int RIL_REQUEST_GET_PREFERRED_NETWORK_LIST = 10051; - static final int RIL_REQUEST_HANGUP_VT = 10052; - - static final int RIL_UNSOL_RELEASE_COMPLETE_MESSAGE = 11001; - static final int RIL_UNSOL_STK_SEND_SMS_RESULT = 11002; - static final int RIL_UNSOL_STK_CALL_CONTROL_RESULT = 11003; - static final int RIL_UNSOL_DUN_CALL_STATUS = 11004; - - static final int RIL_UNSOL_O2_HOME_ZONE_INFO = 11007; - static final int RIL_UNSOL_DEVICE_READY_NOTI = 11008; - static final int RIL_UNSOL_GPS_NOTI = 11009; - static final int RIL_UNSOL_AM = 11010; - static final int RIL_UNSOL_DUN_PIN_CONTROL_SIGNAL = 11011; - static final int RIL_UNSOL_DATA_SUSPEND_RESUME = 11012; - static final int RIL_UNSOL_SAP = 11013; - - static final int RIL_UNSOL_SIM_SMS_STORAGE_AVAILALE = 11015; - static final int RIL_UNSOL_HSDPA_STATE_CHANGED = 11016; - static final int RIL_UNSOL_WB_AMR_STATE = 11017; - static final int RIL_UNSOL_TWO_MIC_STATE = 11018; - static final int RIL_UNSOL_DHA_STATE = 11019; - static final int RIL_UNSOL_UART = 11020; - static final int RIL_UNSOL_RESPONSE_HANDOVER = 11021; - static final int RIL_UNSOL_IPV6_ADDR = 11022; - static final int RIL_UNSOL_NWK_INIT_DISC_REQUEST = 11023; - static final int RIL_UNSOL_RTS_INDICATION = 11024; - static final int RIL_UNSOL_OMADM_SEND_DATA = 11025; - static final int RIL_UNSOL_DUN = 11026; - static final int RIL_UNSOL_SYSTEM_REBOOT = 11027; - static final int RIL_UNSOL_VOICE_PRIVACY_CHANGED = 11028; - static final int RIL_UNSOL_UTS_GETSMSCOUNT = 11029; - static final int RIL_UNSOL_UTS_GETSMSMSG = 11030; - static final int RIL_UNSOL_UTS_GET_UNREAD_SMS_STATUS = 11031; - static final int RIL_UNSOL_MIP_CONNECT_STATUS = 11032; - - private Object mCatProCmdBuffer; - /* private Message mPendingGetSimStatus; */ - - public SamsungExynos4RIL(Context context, int networkMode, int cdmaSubscription, Integer instanceId) { - super(context, networkMode, cdmaSubscription, instanceId); - } - - static String - requestToString(int request) { - switch (request) { - case RIL_REQUEST_DIAL_EMERGENCY: return "DIAL_EMERGENCY"; - default: return RIL.requestToString(request); - } - } - - @Override - protected RILRequest processSolicited (Parcel p) { - int serial, error; - boolean found = false; - - serial = p.readInt(); - error = p.readInt(); - - RILRequest rr; - - rr = findAndRemoveRequestFromList(serial); - - if (rr == null) { - Rlog.w(RILJ_LOG_TAG, "Unexpected solicited response! sn: " - + serial + " error: " + error); - return null; - } - - Object ret = null; - - if (error == 0 || p.dataAvail() > 0) { - // either command succeeds or command fails but with data payload - try {switch (rr.mRequest) { - /* - cat libs/telephony/ril_commands.h \ - | egrep "^ *{RIL_" \ - | sed -re 's/\{([^,]+),[^,]+,([^}]+).+/case \1: ret = \2(p); break;/' - */ - case RIL_REQUEST_GET_SIM_STATUS: ret = responseIccCardStatus(p); break; - case RIL_REQUEST_ENTER_SIM_PIN: ret = responseInts(p); break; - case RIL_REQUEST_ENTER_SIM_PUK: ret = responseInts(p); break; - case RIL_REQUEST_ENTER_SIM_PIN2: ret = responseInts(p); break; - case RIL_REQUEST_ENTER_SIM_PUK2: ret = responseInts(p); break; - case RIL_REQUEST_CHANGE_SIM_PIN: ret = responseInts(p); break; - case RIL_REQUEST_CHANGE_SIM_PIN2: ret = responseInts(p); break; - case RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION: ret = responseInts(p); break; - case RIL_REQUEST_GET_CURRENT_CALLS: ret = responseCallList(p); break; - case RIL_REQUEST_DIAL: ret = responseVoid(p); break; - case RIL_REQUEST_DIAL_EMERGENCY: ret = responseVoid(p); break; - case RIL_REQUEST_GET_IMSI: ret = responseString(p); break; - case RIL_REQUEST_HANGUP: ret = responseVoid(p); break; - case RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND: ret = responseVoid(p); break; - case RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND: { - if (mTestingEmergencyCall.getAndSet(false)) { - if (mEmergencyCallbackModeRegistrant != null) { - riljLog("testing emergency call, notify ECM Registrants"); - mEmergencyCallbackModeRegistrant.notifyRegistrant(); - } - } - ret = responseVoid(p); - break; - } - case RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE: ret = responseVoid(p); break; - case RIL_REQUEST_CONFERENCE: ret = responseVoid(p); break; - case RIL_REQUEST_UDUB: ret = responseVoid(p); break; - case RIL_REQUEST_LAST_CALL_FAIL_CAUSE: ret = responseFailCause(p); break; - case RIL_REQUEST_SIGNAL_STRENGTH: ret = responseSignalStrength(p); break; - case RIL_REQUEST_VOICE_REGISTRATION_STATE: ret = responseStrings(p); break; - case RIL_REQUEST_DATA_REGISTRATION_STATE: ret = responseStrings(p); break; - case RIL_REQUEST_OPERATOR: ret = responseStrings(p); break; - case RIL_REQUEST_RADIO_POWER: ret = responseVoid(p); break; - case RIL_REQUEST_DTMF: ret = responseVoid(p); break; - case RIL_REQUEST_SEND_SMS: ret = responseSMS(p); break; - case RIL_REQUEST_SEND_SMS_EXPECT_MORE: ret = responseSMS(p); break; - case RIL_REQUEST_SETUP_DATA_CALL: ret = responseSetupDataCall(p); break; - case RIL_REQUEST_SIM_IO: ret = responseICC_IO(p); break; - case RIL_REQUEST_SEND_USSD: ret = responseVoid(p); break; - case RIL_REQUEST_CANCEL_USSD: ret = responseVoid(p); break; - case RIL_REQUEST_GET_CLIR: ret = responseInts(p); break; - case RIL_REQUEST_SET_CLIR: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_CALL_FORWARD_STATUS: ret = responseCallForward(p); break; - case RIL_REQUEST_SET_CALL_FORWARD: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_CALL_WAITING: ret = responseInts(p); break; - case RIL_REQUEST_SET_CALL_WAITING: ret = responseVoid(p); break; - case RIL_REQUEST_SMS_ACKNOWLEDGE: ret = responseVoid(p); break; - case RIL_REQUEST_GET_IMEI: ret = responseString(p); break; - case RIL_REQUEST_GET_IMEISV: ret = responseString(p); break; - case RIL_REQUEST_ANSWER: ret = responseVoid(p); break; - case RIL_REQUEST_DEACTIVATE_DATA_CALL: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_FACILITY_LOCK: ret = responseInts(p); break; - case RIL_REQUEST_SET_FACILITY_LOCK: ret = responseInts(p); break; - case RIL_REQUEST_CHANGE_BARRING_PASSWORD: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE: ret = responseInts(p); break; - case RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC: ret = responseVoid(p); break; - case RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS : ret = responseOperatorInfos(p); break; - case RIL_REQUEST_DTMF_START: ret = responseVoid(p); break; - case RIL_REQUEST_DTMF_STOP: ret = responseVoid(p); break; - case RIL_REQUEST_BASEBAND_VERSION: ret = responseString(p); break; - case RIL_REQUEST_SEPARATE_CONNECTION: ret = responseVoid(p); break; - case RIL_REQUEST_SET_MUTE: ret = responseVoid(p); break; - case RIL_REQUEST_GET_MUTE: ret = responseInts(p); break; - case RIL_REQUEST_QUERY_CLIP: ret = responseInts(p); break; - case RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE: ret = responseInts(p); break; - case RIL_REQUEST_DATA_CALL_LIST: ret = responseDataCallList(p); break; - case RIL_REQUEST_RESET_RADIO: ret = responseVoid(p); break; - case RIL_REQUEST_OEM_HOOK_RAW: ret = responseRaw(p); break; - case RIL_REQUEST_OEM_HOOK_STRINGS: ret = responseStrings(p); break; - case RIL_REQUEST_SCREEN_STATE: ret = responseVoid(p); break; - case RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION: ret = responseVoid(p); break; - case RIL_REQUEST_WRITE_SMS_TO_SIM: ret = responseInts(p); break; - case RIL_REQUEST_DELETE_SMS_ON_SIM: ret = responseVoid(p); break; - case RIL_REQUEST_SET_BAND_MODE: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE: ret = responseInts(p); break; - case RIL_REQUEST_STK_GET_PROFILE: ret = responseString(p); break; - case RIL_REQUEST_STK_SET_PROFILE: ret = responseVoid(p); break; - case RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND: ret = responseString(p); break; - case RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE: ret = responseVoid(p); break; - case RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM: ret = responseInts(p); break; - case RIL_REQUEST_EXPLICIT_CALL_TRANSFER: ret = responseVoid(p); break; - case RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE: ret = responseVoid(p); break; - case RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE: ret = responseGetPreferredNetworkType(p); break; - case RIL_REQUEST_GET_NEIGHBORING_CELL_IDS: ret = responseCellList(p); break; - case RIL_REQUEST_SET_LOCATION_UPDATES: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE: ret = responseInts(p); break; - case RIL_REQUEST_SET_TTY_MODE: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_TTY_MODE: ret = responseInts(p); break; - case RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE: ret = responseInts(p); break; - case RIL_REQUEST_CDMA_FLASH: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_BURST_DTMF: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_SEND_SMS: ret = responseSMS(p); break; - case RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE: ret = responseVoid(p); break; - case RIL_REQUEST_GSM_GET_BROADCAST_CONFIG: ret = responseGmsBroadcastConfig(p); break; - case RIL_REQUEST_GSM_SET_BROADCAST_CONFIG: ret = responseVoid(p); break; - case RIL_REQUEST_GSM_BROADCAST_ACTIVATION: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG: ret = responseCdmaBroadcastConfig(p); break; - case RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_BROADCAST_ACTIVATION: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_SUBSCRIPTION: ret = responseStrings(p); break; - case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: ret = responseInts(p); break; - case RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM: ret = responseVoid(p); break; - case RIL_REQUEST_DEVICE_IDENTITY: ret = responseStrings(p); break; - case RIL_REQUEST_GET_SMSC_ADDRESS: ret = responseString(p); break; - case RIL_REQUEST_SET_SMSC_ADDRESS: ret = responseVoid(p); break; - case RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE: ret = responseVoid(p); break; - case RIL_REQUEST_REPORT_SMS_MEMORY_STATUS: ret = responseVoid(p); break; - case RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING: ret = responseVoid(p); break; - case RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE: ret = responseInts(p); break; - case RIL_REQUEST_ISIM_AUTHENTICATION: ret = responseString(p); break; - case RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU: ret = responseVoid(p); break; - case RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS: ret = responseICC_IO(p); break; - case RIL_REQUEST_VOICE_RADIO_TECH: ret = responseInts(p); break; - case RIL_REQUEST_GET_CELL_INFO_LIST: ret = responseCellInfoList(p); break; - case RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE: ret = responseVoid(p); break; - case RIL_REQUEST_SET_INITIAL_ATTACH_APN: ret = responseVoid(p); break; - case RIL_REQUEST_SET_DATA_PROFILE: ret = responseVoid(p); break; - case RIL_REQUEST_IMS_REGISTRATION_STATE: ret = responseInts(p); break; - case RIL_REQUEST_IMS_SEND_SMS: ret = responseSMS(p); break; - case RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC: ret = responseICC_IO(p); break; - case RIL_REQUEST_SIM_OPEN_CHANNEL: ret = responseInts(p); break; - case RIL_REQUEST_SIM_CLOSE_CHANNEL: ret = responseVoid(p); break; - case RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL: ret = responseICC_IO(p); break; - case RIL_REQUEST_SIM_GET_ATR: ret = responseString(p); break; - case RIL_REQUEST_NV_READ_ITEM: ret = responseString(p); break; - case RIL_REQUEST_NV_WRITE_ITEM: ret = responseVoid(p); break; - case RIL_REQUEST_NV_WRITE_CDMA_PRL: ret = responseVoid(p); break; - case RIL_REQUEST_NV_RESET_CONFIG: ret = responseVoid(p); break; - case RIL_REQUEST_SET_UICC_SUBSCRIPTION: ret = responseVoid(p); break; - case RIL_REQUEST_ALLOW_DATA: ret = responseVoid(p); break; - case RIL_REQUEST_GET_HARDWARE_CONFIG: ret = responseHardwareConfig(p); break; - case RIL_REQUEST_SIM_AUTHENTICATION: ret = responseICC_IOBase64(p); break; - case RIL_REQUEST_SHUTDOWN: ret = responseVoid(p); break; - case RIL_REQUEST_GET_RADIO_CAPABILITY: ret = responseRadioCapability(p); break; - case RIL_REQUEST_SET_RADIO_CAPABILITY: ret = responseRadioCapability(p); break; - case RIL_REQUEST_START_LCE: ret = responseLceStatus(p); break; - case RIL_REQUEST_STOP_LCE: ret = responseLceStatus(p); break; - case RIL_REQUEST_PULL_LCEDATA: ret = responseLceData(p); break; - case RIL_REQUEST_GET_ACTIVITY_INFO: ret = responseActivityData(p); break; - default: - throw new RuntimeException("Unrecognized solicited response: " + rr.mRequest); - //break; - }} catch (Throwable tr) { - // Exceptions here usually mean invalid RIL responses - - Rlog.w(RILJ_LOG_TAG, rr.serialString() + "< " - + requestToString(rr.mRequest) - + " exception, possible invalid RIL response", tr); - - if (rr.mResult != null) { - AsyncResult.forMessage(rr.mResult, null, tr); - rr.mResult.sendToTarget(); - } - return rr; - } - } - - if (rr.mRequest == RIL_REQUEST_SHUTDOWN) { - // Set RADIO_STATE to RADIO_UNAVAILABLE to continue shutdown process - // regardless of error code to continue shutdown procedure. - riljLog("Response to RIL_REQUEST_SHUTDOWN received. Error is " + - error + " Setting Radio State to Unavailable regardless of error."); - setRadioState(RadioState.RADIO_UNAVAILABLE); - } - - // Here and below fake RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, see b/7255789. - // This is needed otherwise we don't automatically transition to the main lock - // screen when the pin or puk is entered incorrectly. - switch (rr.mRequest) { - case RIL_REQUEST_ENTER_SIM_PUK: - case RIL_REQUEST_ENTER_SIM_PUK2: - if (mIccStatusChangedRegistrants != null) { - if (RILJ_LOGD) { - riljLog("ON enter sim puk fakeSimStatusChanged: reg count=" - + mIccStatusChangedRegistrants.size()); - } - mIccStatusChangedRegistrants.notifyRegistrants(); - } - break; - } - - if (error != 0) { - switch (rr.mRequest) { - case RIL_REQUEST_ENTER_SIM_PIN: - case RIL_REQUEST_ENTER_SIM_PIN2: - case RIL_REQUEST_CHANGE_SIM_PIN: - case RIL_REQUEST_CHANGE_SIM_PIN2: - case RIL_REQUEST_SET_FACILITY_LOCK: - if (mIccStatusChangedRegistrants != null) { - if (RILJ_LOGD) { - riljLog("ON some errors fakeSimStatusChanged: reg count=" - + mIccStatusChangedRegistrants.size()); - } - mIccStatusChangedRegistrants.notifyRegistrants(); - } - break; - case RIL_REQUEST_GET_RADIO_CAPABILITY: { - // Ideally RIL's would support this or at least give NOT_SUPPORTED - // but the hammerhead RIL reports GENERIC :( - // TODO - remove GENERIC_FAILURE catching: b/21079604 - if (REQUEST_NOT_SUPPORTED == error || - GENERIC_FAILURE == error) { - // we should construct the RAF bitmask the radio - // supports based on preferred network bitmasks - ret = makeStaticRadioCapability(); - error = 0; - } - break; - } - case RIL_REQUEST_GET_ACTIVITY_INFO: - ret = new ModemActivityInfo(0, 0, 0, - new int [ModemActivityInfo.TX_POWER_LEVELS], 0, 0); - error = 0; - break; - } - - if (error != 0) rr.onError(error, ret); - } - if (error == 0) { - if (RILJ_LOGD) riljLog(rr.serialString() + "< " + requestToString(rr.mRequest) - + " " + retToString(rr.mRequest, ret)); - - if (rr.mResult != null) { - AsyncResult.forMessage(rr.mResult, ret, null); - rr.mResult.sendToTarget(); - } - } - - return rr; - } - - @Override - public void - dial(String address, int clirMode, UUSInfo uusInfo, Message result) { - if (PhoneNumberUtils.isEmergencyNumber(address)) { - dialEmergencyCall(address, clirMode, result); - return; - } - - RILRequest rr = RILRequest.obtain(RIL_REQUEST_DIAL, result); - rr.mParcel.writeString(address); - rr.mParcel.writeInt(clirMode); - - if (uusInfo == null) { - rr.mParcel.writeInt(0); // UUS information is absent - } else { - rr.mParcel.writeInt(1); // UUS information is present - rr.mParcel.writeInt(uusInfo.getType()); - rr.mParcel.writeInt(uusInfo.getDcs()); - rr.mParcel.writeByteArray(uusInfo.getUserData()); - } - - if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)); - - send(rr); - } - - public void - dialEmergencyCall(String address, int clirMode, Message result) { - Rlog.v(RILJ_LOG_TAG, "Emergency dial: " + address); - - RILRequest rr = RILRequest.obtain(RIL_REQUEST_DIAL_EMERGENCY, result); - rr.mParcel.writeString(address + "/"); - rr.mParcel.writeInt(clirMode); - rr.mParcel.writeInt(0); // UUS information is absent - - if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)); - - send(rr); - } - - @Override - protected void - processUnsolicited (Parcel p) { - int dataPosition = p.dataPosition(); - int response = p.readInt(); - - switch(response) { - case RIL_UNSOL_STK_PROACTIVE_COMMAND: - Object ret = responseString(p); - if (RILJ_LOGD) unsljLogRet(response, ret); - - if (mCatProCmdRegistrant != null) { - mCatProCmdRegistrant.notifyRegistrant( - new AsyncResult (null, ret, null)); - } else { - // The RIL will send a CAT proactive command before the - // registrant is registered. Buffer it to make sure it - // does not get ignored (and breaks CatService). - mCatProCmdBuffer = ret; - } - break; - - default: - // Rewind the Parcel - p.setDataPosition(dataPosition); - - // Forward responses that we are not overriding to the super class - super.processUnsolicited(p); - return; - } - - } - - @Override - public void setOnCatProactiveCmd(Handler h, int what, Object obj) { - mCatProCmdRegistrant = new Registrant (h, what, obj); - if (mCatProCmdBuffer != null) { - mCatProCmdRegistrant.notifyRegistrant( - new AsyncResult (null, mCatProCmdBuffer, null)); - mCatProCmdBuffer = null; - } - } - - private void - constructGsmSendSmsRilRequest (RILRequest rr, String smscPDU, String pdu) { - rr.mParcel.writeInt(2); - rr.mParcel.writeString(smscPDU); - rr.mParcel.writeString(pdu); - } - - /** - * The RIL can't handle the RIL_REQUEST_SEND_SMS_EXPECT_MORE - * request properly, so we use RIL_REQUEST_SEND_SMS instead. - */ - @Override - public void - sendSMSExpectMore (String smscPDU, String pdu, Message result) { - RILRequest rr - = RILRequest.obtain(RIL_REQUEST_SEND_SMS, result); - - constructGsmSendSmsRilRequest(rr, smscPDU, pdu); - - if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)); - - send(rr); - } - -} diff --git a/rootdir/init.smdk4210.rc b/rootdir/init.smdk4210.rc index 32dc817..c37958d 100644 --- a/rootdir/init.smdk4210.rc +++ b/rootdir/init.smdk4210.rc @@ -2,8 +2,6 @@ import init.smdk4210.usb.rc import init.gps.rc on init - export LD_SHIM_LIBS /system/lib/libsec-ril.so|libsamsung_symbols.so - mkdir /efs 0771 radio system mkdir /preload 0771 system system mkdir /mnt 0775 root system @@ -321,13 +319,6 @@ on boot # increase read-ahead value to 256 kb write /sys/block/mmcblk0/queue/read_ahead_kb 256 -# For RIL -service cpboot-daemon /sbin/cbd -d -p 8 - class main - user root - group radio cache inet misc audio sdcard_rw log sdcard_r - seclabel u:r:cpboot-daemon:s0 - service charger /sbin/healthd -c class charger critical diff --git a/selinux/cpboot-daemon.te b/selinux/cpboot-daemon.te deleted file mode 100644 index ef49102..0000000 --- a/selinux/cpboot-daemon.te +++ /dev/null @@ -1,23 +0,0 @@ -type cpboot-daemon, domain; - -permissive cpboot-daemon; - -allow cpboot-daemon cgroup:dir { create add_name }; -allow cpboot-daemon device:dir { write remove_name add_name }; -allow cpboot-daemon efs_block_device:blk_file { read open }; -allow cpboot-daemon efs_device_file:dir search; -allow cpboot-daemon efs_file:file { read write open }; -allow cpboot-daemon init:unix_stream_socket connectto; -allow cpboot-daemon log_device:chr_file { write open }; -allow cpboot-daemon log_device:dir search; -allow cpboot-daemon property_socket:sock_file write; -allow cpboot-daemon radio_device:chr_file { read write ioctl open }; -allow cpboot-daemon radio_prop:property_service set; -allow cpboot-daemon self:capability { setuid }; -allow cpboot-daemon sysfs_radio:file { read write open }; -allow cpboot-daemon usbfs:dir search; - - -# FIX ME -# allow cpboot-daemon usbfs:filesystem mount; -# allow cpboot-daemon self:capability { mknod }; diff --git a/selinux/init.te b/selinux/init.te index 2a23be5..ea98326 100644 --- a/selinux/init.te +++ b/selinux/init.te @@ -2,4 +2,3 @@ allow init self:capability sys_module; allow init tmpfs:lnk_file create; allow init rild:process noatsecure; allow init debugfs:dir mounton; -domain_trans(init, rootfs, cpboot-daemon) -- cgit v1.1