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

Commit 8814befa authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by android-build-merger
Browse files

Merge "RIL changes to allow the modem to query the framework for the key." am: 0c83ef2c 

am: 1dec74b7

Change-Id: I6b15e49763d8e0cfa23238834a8056288de77176
parents c1da2a03 1dec74b7

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;
@@ -465,4 +466,5 @@ cat include/telephony/ril.h | \ 
    int RIL_UNSOL_STK_CC_ALPHA_NOTIFY = 1044;

    int RIL_UNSOL_LCEDATA_RECV = 1045;

    int RIL_UNSOL_PCO_DATA = 1046;

    int RIL_UNSOL_CARRIER_INFO_IMSI_ENCRYPTION = 1047;

}