diff --git a/interfaces/inner_api/vibrator/vibrator_agent_type.h b/interfaces/inner_api/vibrator/vibrator_agent_type.h index 861eb66cf327b96356198ad3e94f9aa48e65a9bb..b692a468c21b45f31822c302c18270a0c5a6f66e 100644 --- a/interfaces/inner_api/vibrator/vibrator_agent_type.h +++ b/interfaces/inner_api/vibrator/vibrator_agent_type.h @@ -91,7 +91,7 @@ typedef enum VibratorUsage { USAGE_MEDIA = 6, /**< Vibration is used for media */ USAGE_PHYSICAL_FEEDBACK = 7, /**< Vibration is used for physical feedback */ USAGE_SIMULATE_REALITY = 8, /**< Vibration is used for simulate reality */ - USAGE_MAX = 9 + USAGE_MAX } VibratorUsage; /** diff --git a/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp index 45db242a0564a1696829cd54a1ad81d6f6b3ad33..7d084e5b5d12d23b608b92dc1c8e2ae6616f411d 100644 --- a/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -26,6 +27,7 @@ namespace Sensors { using namespace OHOS::HiviewDFX; namespace { constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "CompatibleConnection" }; +const std::string VIBRATE_MOCK_THREAD_NAME = "OS_VibMock"; std::unordered_map g_vibratorEffect = { {"haptic.clock.timer", 2000}, {"haptic.default.effect", 804}, @@ -172,6 +174,7 @@ int32_t CompatibleConnection::DestroyHdiConnection() void CompatibleConnection::VibrateProcess() { CALL_LOG_ENTER; + prctl(PR_SET_NAME, VIBRATE_MOCK_THREAD_NAME.c_str()); clock_t vibrateStartTime = clock(); while (clock() - vibrateStartTime < duration_) { if (isStop_) { diff --git a/services/miscdevice_service/src/vibrator_thread.cpp b/services/miscdevice_service/src/vibrator_thread.cpp index eedaec23987cb2e3c7874672613a865cb26690b3..724d3f32de82152205d3e21b7420b2fea9165db2 100644 --- a/services/miscdevice_service/src/vibrator_thread.cpp +++ b/services/miscdevice_service/src/vibrator_thread.cpp @@ -15,6 +15,8 @@ #include "vibrator_thread.h" +#include + #include "custom_vibration_matcher.h" #include "sensors_errors.h" @@ -22,11 +24,14 @@ namespace OHOS { namespace Sensors { namespace { constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "VibratorThread" }; +const std::string VIBRATE_CONTROL_THREAD_NAME = "OS_VibControl"; constexpr size_t COMPOSITE_EFFECT_PART = 128; } // namespace bool VibratorThread::Run() { + CALL_LOG_ENTER; + prctl(PR_SET_NAME, VIBRATE_CONTROL_THREAD_NAME.c_str()); VibrateInfo info = GetCurrentVibrateInfo(); if (info.mode == VIBRATE_TIME) { int32_t ret = PlayOnce(info); diff --git a/utils/common/include/permission_util.h b/utils/common/include/permission_util.h index cce531dbb068215c2a122d5e4dfe9cccf4d44ddb..fd6adf17ea23dce8a7ef0ef1a08b543749230386 100644 --- a/utils/common/include/permission_util.h +++ b/utils/common/include/permission_util.h @@ -30,7 +30,7 @@ class PermissionUtil : public Singleton { public: PermissionUtil() = default; virtual ~PermissionUtil() {}; - int32_t CheckVibratePermission(AccessTokenID callerToken, std::string permissionName); + int32_t CheckVibratePermission(AccessTokenID callerToken, const std::string &permissionName); }; } // namespace Sensors } // namespace OHOS diff --git a/utils/common/include/raw_file_descriptor.h b/utils/common/include/raw_file_descriptor.h index 518fc85e93b2afea7c3801f181e5719596ae5998..04c04450609778a5afb802f1359d4276a192eab7 100644 --- a/utils/common/include/raw_file_descriptor.h +++ b/utils/common/include/raw_file_descriptor.h @@ -21,7 +21,7 @@ namespace OHOS { namespace Sensors { struct RawFileDescriptor { - int32_t fd = 0; + int32_t fd = -1; int64_t offset = 0; int64_t length = -1; }; diff --git a/utils/common/src/permission_util.cpp b/utils/common/src/permission_util.cpp index 6b0fea62eec9e4f7b64ebac51645c5dc74863aaa..f7d7107aaf9db5b6ce439e46ccb2019629662a26 100644 --- a/utils/common/src/permission_util.cpp +++ b/utils/common/src/permission_util.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Sensors { using namespace OHOS::HiviewDFX; -int32_t PermissionUtil::CheckVibratePermission(AccessTokenID callerToken, std::string permissionName) +int32_t PermissionUtil::CheckVibratePermission(AccessTokenID callerToken, const std::string &permissionName) { return AccessTokenKit::VerifyAccessToken(callerToken, permissionName); }