diff options
| author | Pankaj Kanwar <pkanwar@google.com> | 2017-06-13 20:39:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-13 20:39:03 +0000 |
| commit | f917c657de4aa183594790f76cad37066ce4e79b (patch) | |
| tree | 6d72b59cfea740ed74f0cfd81f5a89c850ee34fc /include | |
| parent | 87d7f199127d1db0faf860c8ffbd50a086558603 (diff) | |
| parent | 06be9ba8d7e709b18e6921fb81302c187219bf21 (diff) | |
| download | android_hardware_ril-f917c657de4aa183594790f76cad37066ce4e79b.tar.gz android_hardware_ril-f917c657de4aa183594790f76cad37066ce4e79b.tar.bz2 android_hardware_ril-f917c657de4aa183594790f76cad37066ce4e79b.zip | |
Merge "Radio Interface changes to allow the modem to query the framework for the key." am: 9d64842e19
am: 06be9ba8d7
Change-Id: Ie7c31abeac3675a840779f262ba364461351fc98
Diffstat (limited to 'include')
| -rw-r--r-- | include/telephony/ril.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/include/telephony/ril.h b/include/telephony/ril.h index 277878a..10b8e6e 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -752,13 +752,17 @@ typedef struct { } RIL_CarrierRestrictions; typedef struct { - const uint8_t * carrierKey; /* Public Key from the Carrier used to encrypt the - * IMSI/IMPI. - */ - const char * KeyIdentifier; /* The keyIdentifier Attribute value pair that helps - * a server locate the private key to decrypt the - * permanent identity. - */ + char * mcc; /* MCC of the Carrier. */ + char * mnc ; /* MNC of the Carrier. */ + uint8_t * carrierKey; /* Public Key from the Carrier used to encrypt the + * IMSI/IMPI. + */ + char * keyIdentifier; /* The keyIdentifier Attribute value pair that helps + * a server locate the private key to decrypt the + * permanent identity. + */ + int64_t expirationTime; /* Date-Time (in UTC) when the key will expire. */ + } RIL_CarrierInfoForImsiEncryption; /* See RIL_REQUEST_LAST_CALL_FAIL_CAUSE */ |