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

Commit e5491122 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Avoid collision with RIL constant 1138, used in some Samsung devices... 

Merge "Avoid collision with RIL constant 1138, used in some Samsung devices for RIL_UNSOL_TETHERED_MODE_STATE_CHANGED. Needs http://review.cyanogenmod.org/#/c/61292/ Thanks to iptux on XDA for pointing out the change in constants between CM-10.2 and CM-11.0." into cm-11.0
parents fda78a5c 8e3fee66

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

+3 −3
Original line number Diff line number Diff line
@@ -332,9 +332,9 @@ cat include/telephony/ril.h | \ 
    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_ON_SS = 1038;

    int RIL_UNSOL_STK_CC_ALPHA_NOTIFY = 1039;

    int RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED = 1040;

    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_STK_SEND_SMS_RESULT = 11002; /* Samsung STK */

}