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

am: 1dec74b78f

Change-Id: I6b15e49763d8e0cfa23238834a8056288de77176
This commit is contained in:
Pankaj Kanwar
2017-04-27 17:58:16 +00:00
committed by android-build-merger

View File

@@ -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;
}