Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- vasy@cm-build:~/android_frameworks_base/telephony/java/com/android/internal/telephony$ git diff cm-10.2.1 RILConstants.java
- diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
- index cd453aa..4c85583 100644
- --- a/telephony/java/com/android/internal/telephony/RILConstants.java
- +++ b/telephony/java/com/android/internal/telephony/RILConstants.java
- @@ -1,8 +1,8 @@
- /*
- * Copyright (C) 2006 The Android Open Source Project
- - * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
- + * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
- *
- - *Not a Contribution.
- + * Not a Contribution.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- @@ -58,9 +58,10 @@ public interface RILConstants {
- int ILLEGAL_SIM_OR_ME = 15; /* network selection failure due
- to wrong SIM/ME and no
- retries needed */
- +
- int DIAL_MODIFIED_TO_USSD = 17; /* DIAL request modified to USSD */
- int DIAL_MODIFIED_TO_SS = 18; /* DIAL request modified to SS */
- - int DIAL_MODIFIED_TO_DIAL = 19; /* DIAL request modified to DIAL with different data */
- + int DIAL_MODIFIED_TO_DIAL = 19; /* DIAL request modified to DIAL with different data*/
- int USSD_MODIFIED_TO_DIAL = 20; /* USSD request modified to DIAL */
- int USSD_MODIFIED_TO_SS = 21; /* USSD request modified to SS */
- int USSD_MODIFIED_TO_USSD = 22; /* USSD request modified to different USSD request */
- @@ -68,6 +69,9 @@ public interface RILConstants {
- int SS_MODIFIED_TO_USSD = 24; /* SS request modified to USSD */
- int SS_MODIFIED_TO_SS = 25; /* SS request modified to different SS request */
- int SUBSCRIPTION_NOT_SUPPORTED = 26; /* Subscription not supported */
- + int MISSING_RESOURCE = 27; /* no logical channel available */
- + int NO_SUCH_ELEMENT = 28; /* application not found on SIM */
- + int INVALID_PARAMETER = 29;
- /* NETWORK_MODE_* See ril.h RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE */
- int NETWORK_MODE_WCDMA_PREF = 0; /* GSM/WCDMA (WCDMA preferred) */
- @@ -83,7 +87,7 @@ public interface RILConstants {
- AVAILABLE Application Settings menu*/
- int NETWORK_MODE_LTE_CDMA_EVDO = 8; /* LTE, CDMA and EvDo */
- int NETWORK_MODE_LTE_GSM_WCDMA = 9; /* LTE, GSM/WCDMA */
- - int NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */
- + int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */
- int NETWORK_MODE_LTE_ONLY = 11; /* LTE Only mode. */
- int NETWORK_MODE_LTE_WCDMA = 12; /* LTE/WCDMA */
- int NETWORK_MODE_TD_SCDMA_ONLY = 13; /* TD-SCDMA only */
- @@ -106,7 +110,8 @@ public interface RILConstants {
- int GSM_PHONE = 1;
- int CDMA_PHONE = 2;
- int SIP_PHONE = 3;
- - int IMS_PHONE = 4;
- + int THIRD_PARTY_PHONE = 4;
- + int IMS_PHONE = 5;
- int LTE_ON_CDMA_UNKNOWN = -1;
- int LTE_ON_CDMA_FALSE = 0;
- @@ -137,6 +142,11 @@ public interface RILConstants {
- int DEACTIVATE_REASON_RADIO_OFF = 1;
- int DEACTIVATE_REASON_PDP_RESET = 2;
- + /* NV config radio reset types. */
- + int NV_CONFIG_RELOAD_RESET = 1;
- + int NV_CONFIG_ERASE_RESET = 2;
- + int NV_CONFIG_FACTORY_RESET = 3;
- +
- /*
- cat include/telephony/ril.h | \
- egrep '^#define' | \
- @@ -177,12 +187,6 @@ cat include/telephony/ril.h | \
- public static final int DATA_PROFILE_CBS = 4;
- public static final int DATA_PROFILE_OEM_BASE = 1000;
- - /**
- - * Tethered mode on/off indication for RIL_UNSOL_TETHERED_MODE_STATE_CHANGED
- - */
- - int RIL_TETHERED_MODE_ON = 1;
- - int RIL_TETHERED_MODE_OFF = 0;
- -
- int RIL_REQUEST_GET_SIM_STATUS = 1;
- int RIL_REQUEST_ENTER_SIM_PIN = 2;
- int RIL_REQUEST_ENTER_SIM_PUK = 3;
- @@ -293,13 +297,28 @@ cat include/telephony/ril.h | \
- int RIL_REQUEST_VOICE_RADIO_TECH = 108;
- int RIL_REQUEST_GET_CELL_INFO_LIST = 109;
- int RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110;
- - int RIL_REQUEST_IMS_REGISTRATION_STATE = 111;
- - int RIL_REQUEST_IMS_SEND_SMS = 112;
- - int RIL_REQUEST_GET_DATA_CALL_PROFILE = 113;
- - int RIL_REQUEST_SET_UICC_SUBSCRIPTION = 114;
- - int RIL_REQUEST_SET_DATA_SUBSCRIPTION = 115;
- - int RIL_REQUEST_GET_UICC_SUBSCRIPTION = 116;
- - int RIL_REQUEST_GET_DATA_SUBSCRIPTION = 117;
- + int RIL_REQUEST_SET_INITIAL_ATTACH_APN = 111;
- + int RIL_REQUEST_IMS_REGISTRATION_STATE = 112;
- + int RIL_REQUEST_IMS_SEND_SMS = 113;
- + int RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC = 114;
- + int RIL_REQUEST_SIM_OPEN_CHANNEL = 115;
- + int RIL_REQUEST_SIM_CLOSE_CHANNEL = 116;
- + int RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL = 117;
- + int RIL_REQUEST_NV_READ_ITEM = 118;
- + int RIL_REQUEST_NV_WRITE_ITEM = 119;
- + int RIL_REQUEST_NV_WRITE_CDMA_PRL = 120;
- + int RIL_REQUEST_NV_RESET_CONFIG = 121;
- + int RIL_REQUEST_SET_UICC_SUBSCRIPTION = 122;
- + int RIL_REQUEST_ALLOW_DATA = 123;
- + int RIL_REQUEST_GET_HARDWARE_CONFIG = 124;
- + int RIL_REQUEST_SIM_AUTHENTICATION = 125;
- + int RIL_REQUEST_GET_DC_RT_INFO = 126;
- + int RIL_REQUEST_SET_DC_RT_INFO_RATE = 127;
- + int RIL_REQUEST_SET_DATA_PROFILE = 128;
- + int RIL_REQUEST_SHUTDOWN = 129;
- + int RIL_REQUEST_GET_DATA_CALL_PROFILE = 130;
- + int RIL_REQUEST_SIM_GET_ATR = 131;
- +
- int RIL_UNSOL_RESPONSE_BASE = 1000;
- int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;
- int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001;
- @@ -333,16 +352,16 @@ cat include/telephony/ril.h | \
- int RIL_UNSOL_RINGBACK_TONE = 1029;
- int RIL_UNSOL_RESEND_INCALL_MUTE = 1030;
- int RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED = 1031;
- - int RIL_UNSOL_CDMA_PRL_CHANGED = 1032;
- + int RIL_UNSOl_CDMA_PRL_CHANGED = 1032;
- int RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE = 1033;
- int RIL_UNSOL_RIL_CONNECTED = 1034;
- int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035;
- int RIL_UNSOL_CELL_INFO_LIST = 1036;
- int RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED = 1037;
- - int RIL_UNSOL_TETHERED_MODE_STATE_CHANGED = 1038;
- - int RIL_UNSOL_ON_SS = 1039;
- - int RIL_UNSOL_STK_CC_ALPHA_NOTIFY = 1040;
- - int RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED = 1041;
- -
- + int RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED = 1038;
- + int RIL_UNSOL_SRVCC_STATE_NOTIFY = 1039;
- + int RIL_UNSOL_HARDWARE_CONFIG_CHANGED = 1040;
- + int RIL_UNSOL_ON_SS = 1042;
- + int RIL_UNSOL_STK_CC_ALPHA_NOTIFY = 1043;
- int RIL_UNSOL_STK_SEND_SMS_RESULT = 11002; /* Samsung STK */
- }
Advertisement
Add Comment
Please, Sign In to add comment