Merge changes I96a780dd,Ib9784443,Ia8f6138b,Id1cdced0,Ice1d9983, ... into main

* changes: Check for errors from EnsureDirectoryExists/RenameFile sensor_injection: Stop using getService ril: Move from volatile to std::atomic ril: Suppress warnings from libradiocompat VehicleService: Drop unused 'connected' variable websocket: Fix initialization order warnings

Author: Treehugger Robot

common/libs/utils/files.cpp

@@ -186,7 +186,7 @@ Result<void> EnsureDirectoryExists(const std::string& directory_path,
  }
  const auto parent_dir = android::base::Dirname(directory_path);
  if (parent_dir.size() > 1) {
- EnsureDirectoryExists(parent_dir, mode, group_name);
+ CF_EXPECT(EnsureDirectoryExists(parent_dir, mode, group_name));
  }
  LOG(VERBOSE) << "Setting up " << directory_path;
  if (mkdir(directory_path.c_str(), mode) < 0 && errno != EEXIST) {

guest/commands/sensor_injection/main.cpp

@@ -32,8 +32,9 @@ using aidl::android::hardware::sensors::SensorStatus;
 using aidl::android::hardware::sensors::SensorType;
 
 std::shared_ptr<ISensors> startSensorInjection() {
- auto sensors = ISensors::fromBinder(ndk::SpAIBinder(
- AServiceManager_getService("android.hardware.sensors.ISensors/default")));
+ auto sensors =
+ ISensors::fromBinder(ndk::SpAIBinder(AServiceManager_checkService(
+ "android.hardware.sensors.ISensors/default")));
  CHECK(sensors != nullptr) << "Unable to get ISensors.";
 
  // Place the ISensors HAL into DATA_INJECTION mode so that we can

guest/hals/ril/reference-libril/RefImsMedia.h

@@ -15,8 +15,11 @@
  */
 #pragma once
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <libradiocompat/RadioImsMedia.h>
 #include <libradiocompat/RadioImsMediaSession.h>
+#pragma clang diagnostic pop
 
 namespace cf::ril {
 

guest/hals/ril/reference-libril/RefRadioConfig.h

@@ -16,7 +16,10 @@
 
 #pragma once
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <libradiocompat/RadioConfig.h>
+#pragma clang diagnostic pop
 
 namespace cf::ril {
 

guest/hals/ril/reference-libril/RefRadioIms.h

@@ -15,7 +15,10 @@
  */
 #pragma once
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <libradiocompat/RadioIms.h>
+#pragma clang diagnostic pop
 
 namespace cf::ril {
 

guest/hals/ril/reference-libril/RefRadioModem.h

@@ -16,7 +16,10 @@
 
 #pragma once
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <libradiocompat/RadioModem.h>
+#pragma clang diagnostic pop
 
 namespace cf::ril {
 

guest/hals/ril/reference-libril/RefRadioNetwork.h

@@ -15,7 +15,10 @@
  */
 #pragma once
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <libradiocompat/RadioNetwork.h>
+#pragma clang diagnostic pop
 
 namespace cf::ril {
 

guest/hals/ril/reference-libril/RefRadioSim.h

@@ -16,7 +16,10 @@
 
 #pragma once
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <libradiocompat/RadioSim.h>
+#pragma clang diagnostic pop
 
 namespace cf::ril {
 

guest/hals/ril/reference-libril/ril_config.cpp

@@ -22,12 +22,16 @@
 #include <android-base/logging.h>
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <android/hardware/radio/config/1.1/IRadioConfig.h>
 #include <android/hardware/radio/config/1.2/IRadioConfigIndication.h>
 #include <android/hardware/radio/config/1.2/IRadioConfigResponse.h>
 #include <android/hardware/radio/config/1.3/IRadioConfig.h>
 #include <android/hardware/radio/config/1.3/IRadioConfigResponse.h>
 #include <libradiocompat/RadioConfig.h>
+#pragma clang diagnostic pop
 
 #include <ril.h>
 #include <guest/hals/ril/reference-libril/ril_service.h>
@@ -50,7 +54,7 @@ RIL_RadioFunctions *s_vendorFunctions_config = NULL;
 static CommandInfo *s_configCommands;
 struct RadioConfigImpl;
 sp<RadioConfigImpl> radioConfigService;
-volatile int32_t mCounterRadioConfig;
+std::atomic_int32_t mCounterRadioConfig;
 
 #if defined (ANDROID_MULTI_SIM)
 #define RIL_UNSOL_RESPONSE(a, b, c, d) RIL_onUnsolicitedResponse((a), (b), (c), (d))
@@ -308,7 +312,7 @@ void checkReturnStatus(Return<void>& ret) {
  // Caller should already hold rdlock, release that first
  // note the current counter to avoid overwriting updates made by another thread before
  // write lock is acquired.
- int counter = mCounterRadioConfig;
+ int32_t counter = mCounterRadioConfig.load();
  pthread_rwlock_t *radioServiceRwlockPtr = radio_1_6::getRadioServiceRwlock(0);
  int ret = pthread_rwlock_unlock(radioServiceRwlockPtr);
  CHECK_EQ(ret, 0);

guest/hals/ril/reference-libril/ril_service.cpp

@@ -25,10 +25,14 @@
 #include <android-base/logging.h>
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <android/hardware/radio/1.6/IRadio.h>
 #include <android/hardware/radio/1.6/IRadioIndication.h>
 #include <android/hardware/radio/1.6/IRadioResponse.h>
 #include <android/hardware/radio/1.6/types.h>
+#include <android/hardware/radio/deprecated/1.0/IOemHook.h>
 #include <libradiocompat/CallbackManager.h>
 #include <libradiocompat/RadioData.h>
 #include <libradiocompat/RadioIms.h>
@@ -37,8 +41,7 @@
 #include <libradiocompat/RadioModem.h>
 #include <libradiocompat/RadioSim.h>
 #include <libradiocompat/RadioVoice.h>
-
-#include <android/hardware/radio/deprecated/1.0/IOemHook.h>
+#pragma clang diagnostic pop
 
 #include <hwbinder/IPCThreadState.h>
 #include <hwbinder/ProcessState.h>
@@ -105,15 +108,15 @@ sp<RadioImpl_1_6> radioService[SIM_COUNT];
 sp<OemHookImpl> oemHookService[SIM_COUNT];
 int64_t nitzTimeReceived[SIM_COUNT];
 // counter used for synchronization. It is incremented every time response callbacks are updated.
-volatile int32_t mCounterRadio[SIM_COUNT];
-volatile int32_t mCounterOemHook[SIM_COUNT];
+std::atomic_int32_t mCounterRadio[SIM_COUNT];
+std::atomic_int32_t mCounterOemHook[SIM_COUNT];
 #else
 sp<RadioImpl_1_6> radioService[1];
 sp<OemHookImpl> oemHookService[1];
 int64_t nitzTimeReceived[1];
 // counter used for synchronization. It is incremented every time response callbacks are updated.
-volatile int32_t mCounterRadio[1];
-volatile int32_t mCounterOemHook[1];
+std::atomic_int32_t mCounterRadio[1];
+std::atomic_int32_t mCounterOemHook[1];
 hidl_vec<uint8_t> osAppIdVec;
 #endif
 
@@ -991,7 +994,8 @@ void checkReturnStatus(int32_t slotId, Return<void>& ret, bool isRadioService) {
  // Caller should already hold rdlock, release that first
  // note the current counter to avoid overwriting updates made by another thread before
  // write lock is acquired.
- int counter = isRadioService ? mCounterRadio[slotId] : mCounterOemHook[slotId];
+ auto counter =
+ isRadioService ? mCounterRadio[slotId].load() : mCounterOemHook[slotId].load();
  pthread_rwlock_t *radioServiceRwlockPtr = radio_1_6::getRadioServiceRwlock(slotId);
  int ret = pthread_rwlock_unlock(radioServiceRwlockPtr);
  CHECK_EQ(ret, 0);