Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b41436 authored by Suresh Koleti's avatar Suresh Koleti Committed by Ricardo Cerqueira
Browse files

Telephony: STK CC feature implementation 

Add strings and constants required for stk cc feature

Change-Id: Id5ec987cdc8dc2d9eebdf01fe546eb96ec0c69f9

Conflicts:
core/res/res/values/strings.xml
Change-Id: Id5ec987cdc8dc2d9eebdf01fe546eb96ec0c69f9
parent 6efcaa48

core/res/res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -4891,4 +4891,14 @@ 


    <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->

    <string name="zen_mode_forever">Indefinitely</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>

core/res/res/values/symbols.xml

+6 −0
Original line number Diff line number Diff line
@@ -923,6 +923,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" />

telephony/java/android/telephony/DisconnectCause.java

+24 −1
Original line number Diff line number Diff line
@@ -160,10 +160,27 @@ public class DisconnectCause { 
     */

    public static final int OUTGOING_CANCELED = 44;



    /**

     * Stk Call Control modified DIAL request to USSD request.

     * {@hide}

     */

    public static final int DIAL_MODIFIED_TO_USSD          = 45;

    /**

     * Stk Call Control modified DIAL request to SS request.

     * {@hide}

     */

    public static final int DIAL_MODIFIED_TO_SS            = 46;

    /**

     * Stk Call Control modified DIAL request to DIAL with modified data.

     * {@hide}

     */

    public static final int DIAL_MODIFIED_TO_DIAL          = 47;



    /** Smallest valid value for call disconnect codes. */

    public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;



    /** Largest valid value for call disconnect codes. */

    /** Largest valid value for call disconnect codes.

        TODO: Not changing the max value as it will need API update. */

    public static final int MAXIMUM_VALID_VALUE = OUTGOING_CANCELED;



    /** Private constructor to avoid class instantiation. */
@@ -256,6 +273,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:

telephony/java/com/android/internal/telephony/RILConstants.java

+14 −2
Original line number Diff line number Diff line
@@ -55,9 +55,19 @@ public interface RILConstants { 
    int ILLEGAL_SIM_OR_ME = 15;               /* network selection failure due

                                                 to wrong SIM/ME and no

                                                 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 = 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 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 */

    int SS_MODIFIED_TO_DIAL = 23;             /* SS request modified to DIAL */

    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 */



    /* NETWORK_MODE_* See ril.h RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE */

    int NETWORK_MODE_WCDMA_PREF     = 0; /* GSM/WCDMA (WCDMA preferred) */
@@ -334,4 +344,6 @@ cat include/telephony/ril.h | \ 
    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;

}