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

Commit 1eedb9c2 authored by pkanwar's avatar pkanwar
Browse files

resolve merge conflicts of 8814befa to oc-dev-plus-aosp 

Test: manual
BUG: 35606429
Change-Id: I0e9c5edaaa3e0ddf7719ebbffd650b8bdd88faa1
parents 8588c09a 8814befa

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

+2 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ cat include/telephony/ril.h | \ 
    int RIL_REQUEST_SEND_DEVICE_STATE = 138;

    int RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER = 139;

    int RIL_REQUEST_SET_SIM_CARD_POWER = 140;

    int RIL_REQUEST_SET_CARRIER_INFO_IMSI_ENCRYPTION = 141;



    int RIL_RESPONSE_ACKNOWLEDGEMENT = 800;
@@ -466,4 +467,5 @@ cat include/telephony/ril.h | \ 
    int RIL_UNSOL_LCEDATA_RECV = 1045;

    int RIL_UNSOL_PCO_DATA = 1046;

    int RIL_UNSOL_MODEM_RESTART = 1047;

    int RIL_UNSOL_CARRIER_INFO_IMSI_ENCRYPTION = 1048;

}