commit d9ad042186fc3cf2189ea7e200f0d08075d33a9c
author Nathan Harold <nharold@google.com> Thu Jun 29 02:11:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 29 02:11:16 2017 +0000
tree 780d20fa104ba7972f7ad95a0a28db0bac063aec
parent 05273b95fde44adec2e7e358adf7bbd4a7094668
parent 3419deee607cffaab25e412d875093400bf37338

Merge "Add cross-validation to IccCardStatusResponse" into oc-dr1-dev am: b4d732b046
am: 3419deee60

Change-Id: Ic5057969ab6b809320c2909a39a000354cea3ec9

libril/ril_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index 308955a..864c45b 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -2864,7 +2864,8 @@
     imsiEncryption.carrierKey = new uint8_t[lSize];
     memcpy(imsiEncryption.carrierKey, data.carrierKey.data(), lSize);
     imsiEncryption.expirationTime = data.expirationTime;
-    s_vendorFunctions->onRequest(pRI->pCI->requestNumber, &imsiEncryption, sizeof(RIL_CarrierInfoForImsiEncryption), pRI);
+    CALL_ONREQUEST(pRI->pCI->requestNumber, &imsiEncryption,
+            sizeof(RIL_CarrierInfoForImsiEncryption), pRI, mSlotId);
     delete(imsiEncryption.carrierKey);
     return Void();
 }