summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-07-06 07:47:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-07-06 07:47:55 +0000
commitf1575d44a910e31bd2a174acd029f55b11c71845 (patch)
tree5b56ff5174275193b2f54fe909b98118159c6009
parent662ce934137795798f025ef35d1c362fb5b3d917 (diff)
parent3c1f1239ad077199a9c0e263e39dbe940d516034 (diff)
downloadplatform_hardware_ril-f1575d44a910e31bd2a174acd029f55b11c71845.tar.gz
platform_hardware_ril-f1575d44a910e31bd2a174acd029f55b11c71845.tar.bz2
platform_hardware_ril-f1575d44a910e31bd2a174acd029f55b11c71845.zip
Merge "change parameter type for 32bit platform"android-r-beta-3android-r-beta-2
-rwxr-xr-xlibril/ril_service.cpp2
-rw-r--r--libril/ril_service.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index c97b607a..e9bbc8b6 100755
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -8632,6 +8632,6 @@ pthread_rwlock_t * radio::getRadioServiceRwlock(int slotId) {
}
// should acquire write lock for the corresponding service before calling this
-void radio::setNitzTimeReceived(int slotId, long timeReceived) {
+void radio::setNitzTimeReceived(int slotId, int64_t timeReceived) {
nitzTimeReceived[slotId] = timeReceived;
}
diff --git a/libril/ril_service.h b/libril/ril_service.h
index 870b644e..77ea28b3 100644
--- a/libril/ril_service.h
+++ b/libril/ril_service.h
@@ -743,7 +743,7 @@ int carrierInfoForImsiEncryption(int slotId,
pthread_rwlock_t * getRadioServiceRwlock(int slotId);
-void setNitzTimeReceived(int slotId, long timeReceived);
+void setNitzTimeReceived(int slotId, int64_t timeReceived);
} // namespace radio