Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev

Browse Source 
* commit '2733ea767b691ada9faabfd41f4175d320053682':
  Telephony: STK CC feature implementation
This commit is contained in:
Amit Mahajan
2014-11-18 21:51:16 +00:00
committed by Android Git Automerger
parent 51ce9cacb6 2733ea767b
commit ca1e3e5e83
4 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/res/res/values/strings.xml
View File

@@ -5132,4 +5132,13 @@
<!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
<string name="system_error_manufacturer">There\'s an internal problem with your device. Contact your manufacturer for details.</string>
<!-- Displayed when the USSD/SS request is modified by STK CC to a
different request. This will be displayed in a toast. -->
<string name="stk_cc_ussd_to_dial">USSD request is modified to DIAL request.</string>
<string name="stk_cc_ussd_to_ss">USSD request is modified to SS request.</string>
<string name="stk_cc_ussd_to_ussd">USSD request is modified to new USSD request.</string>
<string name="stk_cc_ss_to_dial">SS request is modified to DIAL request.</string>
<string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string>
<string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string>
</resources>

6
core/res/res/values/symbols.xml
View File

@@ -918,6 +918,12 @@
<java-symbol type="string" name="default_audio_route_name_dock_speakers" />
<java-symbol type="string" name="default_media_route_name_hdmi" />
<java-symbol type="string" name="default_audio_route_category_name" />
<java-symbol type="string" name="stk_cc_ss_to_dial" />
<java-symbol type="string" name="stk_cc_ss_to_ss" />
<java-symbol type="string" name="stk_cc_ss_to_ussd" />
<java-symbol type="string" name="stk_cc_ussd_to_dial" />
<java-symbol type="string" name="stk_cc_ussd_to_ss" />
<java-symbol type="string" name="stk_cc_ussd_to_ussd" />
<java-symbol type="string" name="safe_media_volume_warning" />
<java-symbol type="string" name="media_route_status_scanning" />
<java-symbol type="string" name="media_route_status_connecting" />

26
telephony/java/android/telephony/DisconnectCause.java
View File

@@ -165,6 +165,22 @@ public class DisconnectCause {
*/
public static final int IMS_MERGED_SUCCESSFULLY = 45;
/**
* Stk Call Control modified DIAL request to USSD request.
* {@hide}
*/
public static final int DIAL_MODIFIED_TO_USSD = 46;
/**
* Stk Call Control modified DIAL request to SS request.
* {@hide}
*/
public static final int DIAL_MODIFIED_TO_SS = 47;
/**
* Stk Call Control modified DIAL request to DIAL with modified data.
* {@hide}
*/
public static final int DIAL_MODIFIED_TO_DIAL = 48;
//*********************************************************************************************
// When adding a disconnect type:
// 1) Please assign the new type the next id value below.
@@ -173,14 +189,14 @@ public class DisconnectCause {
// 4) Update toString() with the newly added disconnect type.
// 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
//
// NextId: 46
// NextId: 49
//*********************************************************************************************
/** Smallest valid value for call disconnect codes. */
public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;
/** Largest valid value for call disconnect codes. */
public static final int MAXIMUM_VALID_VALUE = IMS_MERGED_SUCCESSFULLY;
public static final int MAXIMUM_VALID_VALUE = DIAL_MODIFIED_TO_DIAL;
/** Private constructor to avoid class instantiation. */
private DisconnectCause() {
@@ -272,6 +288,12 @@ public class DisconnectCause {
return "CDMA_CALL_LOST";
case EXITED_ECM:
return "EXITED_ECM";
case DIAL_MODIFIED_TO_USSD:
return "DIAL_MODIFIED_TO_USSD";
case DIAL_MODIFIED_TO_SS:
return "DIAL_MODIFIED_TO_SS";
case DIAL_MODIFIED_TO_DIAL:
return "DIAL_MODIFIED_TO_DIAL";
case ERROR_UNSPECIFIED:
return "ERROR_UNSPECIFIED";
case OUTGOING_FAILURE:

12
telephony/java/com/android/internal/telephony/RILConstants.java
View File

@@ -57,7 +57,17 @@ public interface RILConstants {
retries needed */
int MISSING_RESOURCE = 16; /* no logical channel available */
int NO_SUCH_ELEMENT = 17; /* application not found on SIM */
int DIAL_MODIFIED_TO_USSD = 18; /* DIAL request modified to USSD */
int DIAL_MODIFIED_TO_SS = 19; /* DIAL request modified to SS */
int DIAL_MODIFIED_TO_DIAL = 20; /* DIAL request modified to DIAL with different data*/
int USSD_MODIFIED_TO_DIAL = 21; /* USSD request modified to DIAL */
int USSD_MODIFIED_TO_SS = 22; /* USSD request modified to SS */
int USSD_MODIFIED_TO_USSD = 23; /* USSD request modified to different USSD request */
int SS_MODIFIED_TO_DIAL = 24; /* SS request modified to DIAL */
int SS_MODIFIED_TO_USSD = 25; /* SS request modified to USSD */
int SUBSCRIPTION_NOT_SUPPORTED = 26; /* Subscription not supported */
int SS_MODIFIED_TO_SS = 27; /* SS request modified to different SS request */
/* NETWORK_MODE_* See ril.h RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE */
int NETWORK_MODE_WCDMA_PREF = 0; /* GSM/WCDMA (WCDMA preferred) */
@@ -339,4 +349,6 @@ cat include/telephony/ril.h | \
int RIL_UNSOL_HARDWARE_CONFIG_CHANGED = 1040;
int RIL_UNSOL_DC_RT_INFO_CHANGED = 1041;
int RIL_UNSOL_RADIO_CAPABILITY = 1042;
int RIL_UNSOL_ON_SS = 1043;
int RIL_UNSOL_STK_CC_ALPHA_NOTIFY = 1044;
}