Merge "RIL changes to allow the modem to query the framework for the key."

2017-04-27 17:41:56 +00:00
parent 37cad12cb1 c66a5296b6
commit 0c83ef2c72
1 changed files with 2 additions and 0 deletions
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -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;
 }