aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BoardConfig.mk1
-rw-r--r--device.mk3
-rw-r--r--ril/telephony/java/com/android/internal/telephony/SamsungOmap4RIL.java447
3 files changed, 1 insertions, 450 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b785a96..969d965 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -26,7 +26,6 @@ TARGET_OTA_ASSERT_DEVICE := espresso3g,espresso-common,p3100,GT-P3100,espressorf
# RIL
BOARD_PROVIDES_LIBRIL := true
-BOARD_RIL_CLASS := ../../../device/samsung/espresso3g/ril
# SELinux
BOARD_SEPOLICY_DIRS += \
diff --git a/device.mk b/device.mk
index 9898b2a..2dbf90f 100644
--- a/device.mk
+++ b/device.mk
@@ -35,8 +35,7 @@ PRODUCT_PACKAGES += \
libsecnativefeature
PRODUCT_PROPERTY_OVERRIDES += \
- mobiledata.interfaces=pdp0,wlan0,gprs,ppp0 \
- ro.telephony.ril_class=SamsungOmap4RIL
+ mobiledata.interfaces=pdp0,wlan0,gprs,ppp0
# These are the hardware-specific features
PRODUCT_COPY_FILES += \
diff --git a/ril/telephony/java/com/android/internal/telephony/SamsungOmap4RIL.java b/ril/telephony/java/com/android/internal/telephony/SamsungOmap4RIL.java
deleted file mode 100644
index 501b91c..0000000
--- a/ril/telephony/java/com/android/internal/telephony/SamsungOmap4RIL.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright (C) 2011 The CyanogenMod Project <http://www.cyanogenmod.org>
- *
- * 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.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.os.Parcel;
-import android.os.Registrant;
-import android.text.TextUtils;
-import android.telephony.Rlog;
-
-import android.telephony.PhoneNumberUtils;
-
-import java.util.ArrayList;
-
-public class SamsungOmap4RIL 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;
-
- public SamsungOmap4RIL(Context context, int preferredNetworkType, int cdmaSubscription, Integer instanceid) {
- super(context, preferredNetworkType, cdmaSubscription, instanceid);
- }
-
- public SamsungOmap4RIL(Context context, int preferredNetworkType, int cdmaSubscription) {
- super(context, preferredNetworkType, cdmaSubscription, null);
- }
-
- 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;
- 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;
- }
- }
-
- // 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;
- }
-
- rr.onError(error, ret);
- return rr;
- }
-
- 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) {
- RILRequest rr;
- if (PhoneNumberUtils.isEmergencyNumber(address)) {
- dialEmergencyCall(address, clirMode, result);
- return;
- }
-
- 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) {
- RILRequest rr;
- Rlog.v(RILJ_LOG_TAG, "Emergency dial: " + address);
-
- 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;
- }
- }
-
- @Override
- public void getRadioCapability(Message response) {
- riljLog("getRadioCapability: returning static radio capability");
- if (response != null) {
- Object ret = makeStaticRadioCapability();
- AsyncResult.forMessage(response, ret, null);
- response.sendToTarget();
- }
- }
-
-}