diff --git a/frameworks/native/miscdevice/src/light_service_client.cpp b/frameworks/native/miscdevice/src/light_service_client.cpp old mode 100755 new mode 100644 index 6690169a10c2657d6b35b595612b001905bc26f5..62080d0d801f6b766140e8164954ef12178f4e6a --- a/frameworks/native/miscdevice/src/light_service_client.cpp +++ b/frameworks/native/miscdevice/src/light_service_client.cpp @@ -94,7 +94,7 @@ int32_t LightServiceClient::Light(int32_t lightId, uint64_t brightness, uint32_t int32_t ret = InitServiceClient(); if (ret != ERR_OK) { HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); - return SENSOR_NATIVE_GET_SERVICE_ERR; + return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->Light(lightId, brightness, timeOn, timeOff); } @@ -105,7 +105,7 @@ int32_t LightServiceClient::PlayLightEffect(int32_t lightId, const std::string & int32_t ret = InitServiceClient(); if (ret != ERR_OK) { HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); - return SENSOR_NATIVE_GET_SERVICE_ERR; + return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->PlayLightEffect(lightId, type); } @@ -116,7 +116,7 @@ int32_t LightServiceClient::StopLightEffect(int32_t lightId) int32_t ret = InitServiceClient(); if (ret != ERR_OK) { HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); - return SENSOR_NATIVE_GET_SERVICE_ERR; + return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->StopLightEffect(lightId); } diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp old mode 100755 new mode 100644 index a491e487f57c1f1d6d2eaa67ad97b141095d4864..96fa0183bdf59bb4860a40a66df45238bd828ff4 --- a/interfaces/native/vibrator/src/vibrator_agent.cpp +++ b/interfaces/native/vibrator/src/vibrator_agent.cpp @@ -69,6 +69,10 @@ int32_t StartVibratorOnce(uint32_t duration) int32_t StopVibrator(const char *mode) { + if (mode == nullptr) { + HiLog::Error(LABEL, "%{public}s mode is invalid", __func__); + return OHOS::Sensors::ERROR; + } if (strcmp(mode, "time") != 0 && strcmp(mode, "preset") != 0) { HiLog::Error(LABEL, "%{public}s mode is invalid, mode is %{public}s", __func__, mode); return OHOS::Sensors::ERROR; diff --git a/interfaces/plugin/vibrator/include/vibrator_napi_utils.h b/interfaces/plugin/vibrator/include/vibrator_napi_utils.h old mode 100755 new mode 100644 index a73f01b5024fe7b65ba25ae2cd71f7d48d77bb63..7d88935e5cdae00533fb82ec8808c8b7f4ca49d8 --- a/interfaces/plugin/vibrator/include/vibrator_napi_utils.h +++ b/interfaces/plugin/vibrator/include/vibrator_napi_utils.h @@ -42,6 +42,5 @@ void EmitAsyncCallbackWork(AsyncCallbackInfo *async_callback_info); int64_t GetCppInt64(napi_value value, napi_env env); napi_value NapiGetNamedProperty(napi_value jsonObject, string name, napi_env env); void EmitPromiseWork(AsyncCallbackInfo *asyncCallbackInfo); -string GetCppString(napi_value value, napi_env env); napi_value GreateBusinessError(napi_env env, int32_t errCode, string errMessage, string errName, string errStack); \ No newline at end of file diff --git a/interfaces/plugin/vibrator/src/vibrator_js.cpp b/interfaces/plugin/vibrator/src/vibrator_js.cpp old mode 100755 new mode 100644 index 8eae8dd5f933165861b15679d0a8c78ff0378f89..a22990170215389486cdb9dfc86bebb7d85adcea --- a/interfaces/plugin/vibrator/src/vibrator_js.cpp +++ b/interfaces/plugin/vibrator/src/vibrator_js.cpp @@ -33,7 +33,7 @@ static napi_value Vibrate(napi_env env, napi_callback_info info) size_t argc = 2; napi_value args[CALLBACK_RESULT_LENGTH]; napi_value thisArg; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, &thisArg, nullptr)); + napi_get_cb_info(env, info, &argc, args, &thisArg, nullptr); if (argc < 1 || argc > CALLBACK_RESULT_LENGTH) { HiLog::Error(LABEL, "%{public}s the number of input parameters does not match", __func__); return nullptr; @@ -53,9 +53,16 @@ static napi_value Vibrate(napi_env env, napi_callback_info info) } else if (IsMatchType(args[0], napi_string, env)) { size_t bufLength = 0; napi_status status = napi_get_value_string_utf8(env, args[0], nullptr, 0, &bufLength); + if (bufLength <= 0) { + HiLog::Error(LABEL, "%{public}s input parameter is invalid", __func__); + return nullptr; + } char *vibratorEffect = (char *)malloc((bufLength + 1) * sizeof(char)); status = napi_get_value_string_utf8(env, args[0], vibratorEffect, bufLength + 1, &bufLength); asyncCallbackInfo->error.code = StartVibrator(vibratorEffect); + if (vibratorEffect != nullptr) { + free(vibratorEffect); + } } if (argc == CALLBACK_RESULT_LENGTH) { if (!IsMatchType(args[1], napi_function, env)) { @@ -69,7 +76,7 @@ static napi_value Vibrate(napi_env env, napi_callback_info info) } else if (argc == 1) { napi_deferred deferred; napi_value promise; - NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); + napi_create_promise(env, &deferred, &promise); asyncCallbackInfo->deferred = deferred; EmitPromiseWork(asyncCallbackInfo); return promise; @@ -82,7 +89,7 @@ static napi_value Stop(napi_env env, napi_callback_info info) size_t argc = 2; napi_value args[2]; napi_value thisArg; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, &thisArg, nullptr)); + napi_get_cb_info(env, info, &argc, args, &thisArg, nullptr); if (argc < 1 || argc > CALLBACK_RESULT_LENGTH) { HiLog::Error(LABEL, "%{public}s the number of input parameters does not match", __func__); return nullptr; @@ -96,9 +103,18 @@ static napi_value Stop(napi_env env, napi_callback_info info) .asyncWork = nullptr, .deferred = nullptr, }; - const char *mode = GetCppString(args[0], env).c_str(); + size_t bufLength = 0; + napi_status status = napi_get_value_string_utf8(env, args[0], nullptr, 0, &bufLength); + if (bufLength <= 0) { + HiLog::Error(LABEL, "%{public}s input parameter is invalid", __func__); + return nullptr; + } + char *mode = (char *)malloc((bufLength + 1) * sizeof(char)); + status = napi_get_value_string_utf8(env, args[0], mode, bufLength + 1, &bufLength); asyncCallbackInfo->error.code = StopVibrator(mode); - + if (mode != nullptr) { + free(mode); + } if (argc == CALLBACK_RESULT_LENGTH) { if (!IsMatchType(args[1], napi_function, env) || !IsMatchType(args[0], napi_string, env)) { HiLog::Error(LABEL, "%{public}s input parameter type does not match", __func__); @@ -111,7 +127,7 @@ static napi_value Stop(napi_env env, napi_callback_info info) } else if (argc == 1) { napi_deferred deferred; napi_value promise; - NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); + napi_create_promise(env, &deferred, &promise); asyncCallbackInfo->deferred = deferred; EmitPromiseWork(asyncCallbackInfo); return promise; diff --git a/interfaces/plugin/vibrator/src/vibrator_napi_utils.cpp b/interfaces/plugin/vibrator/src/vibrator_napi_utils.cpp old mode 100755 new mode 100644 index f227990e09b47fffaf99f5fc58a6bc767998c739..addb216d965d9c7bd141c2aeb8c2d0583451b1bd --- a/interfaces/plugin/vibrator/src/vibrator_napi_utils.cpp +++ b/interfaces/plugin/vibrator/src/vibrator_napi_utils.cpp @@ -53,18 +53,6 @@ int32_t GetCppInt32(napi_value value, napi_env env) return number; } -string GetCppString(napi_value value, napi_env env) -{ - size_t bufLength = 0; - napi_status status = napi_get_value_string_utf8(env, value, nullptr, 0, &bufLength); - char *buff = (char *)malloc((bufLength + 1) * sizeof(char)); - if (buff == nullptr) { - HiLog::Error(LABEL, "js obj to str malloc failed"); - } - status = napi_get_value_string_utf8(env, value, buff, bufLength + 1, &bufLength); - return buff; -} - int64_t GetCppInt64(napi_value value, napi_env env) { int64_t number; @@ -79,15 +67,15 @@ napi_value GreateBusinessError(napi_env env, int32_t errCode, string errMessage, napi_value message = nullptr; napi_value name = nullptr; napi_value stack = nullptr; - NAPI_CALL(env, napi_create_int32(env, errCode, &code)); - NAPI_CALL(env, napi_create_string_utf8(env, errMessage.data(), NAPI_AUTO_LENGTH, &message)); - NAPI_CALL(env, napi_create_string_utf8(env, errName.data(), NAPI_AUTO_LENGTH, &name)); - NAPI_CALL(env, napi_create_string_utf8(env, errStack.data(), NAPI_AUTO_LENGTH, &stack)); - NAPI_CALL(env, napi_create_object(env, &result)); - NAPI_CALL(env, napi_set_named_property(env, result, "code", code)); - NAPI_CALL(env, napi_set_named_property(env, result, "message", message)); - NAPI_CALL(env, napi_set_named_property(env, result, "name", name)); - NAPI_CALL(env, napi_set_named_property(env, result, "stack", stack)); + napi_create_int32(env, errCode, &code); + napi_create_string_utf8(env, errMessage.data(), NAPI_AUTO_LENGTH, &message); + napi_create_string_utf8(env, errName.data(), NAPI_AUTO_LENGTH, &name); + napi_create_string_utf8(env, errStack.data(), NAPI_AUTO_LENGTH, &stack); + napi_create_object(env, &result); + napi_set_named_property(env, result, "code", code); + napi_set_named_property(env, result, "message", message); + napi_set_named_property(env, result, "name", name); + napi_set_named_property(env, result, "stack", stack); return result; } diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn old mode 100755 new mode 100644 index f544f0281053295c0e44da0652aa91e824c38fc7..25fe2c9c3450344eb14af5abbbe9ff61bb55e05c --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -38,16 +38,8 @@ ohos_shared_library("libmiscdevice_service") { ] external_deps = [ - #"appexecfwk:appexecfwk_base", - #"appexecfwk:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", - - #"intent:base", - #"intent:intent", "ipc:ipc_core", - - #"communication_L2:ipc_core", - #"permission:permission_sdk_cxx", "permission_standard:libpermissionsdk_standard", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp old mode 100755 new mode 100644 index 8f63c91d92f4daf16ce2a55e754cdff4f051f850..ae774661581f910596d4240c55ced6f5c1ca12cf --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -338,7 +338,7 @@ int32_t MiscdeviceService::SetVibratorParameter(int32_t vibratorId, const std::s std::string MiscdeviceService::GetVibratorParameter(int32_t vibratorId, const std::string &cmd) { - return nullptr; + return cmd; } std::vector MiscdeviceService::GetLightSupportId() diff --git a/utils/include/dmd_report.h b/utils/include/dmd_report.h old mode 100755 new mode 100644 index a47975c489bceb684aa9a9fa6f335dd08c89340d..aee2fcd2a0ee4501d2bbd732afbfb6d133dd9543 --- a/utils/include/dmd_report.h +++ b/utils/include/dmd_report.h @@ -23,18 +23,12 @@ namespace OHOS { namespace Sensors { enum SensorEventId { - JNI_ENV_VAR_EXCEPTION = 951000106, CLASS_NOT_FOUND = 951000107, NATIVE_METHOD_REGISTER_EXCEPTION = 951000108, - JAVA_VM_THREAD_ATTACH_EXCEPTION = 951000109, - SENSOR_SERVICE_EXCEPTION = 951000110, MISC_SERVICE_EXCEPTION = 951000111, - SENSOR_SERVICE_IPC_EXCEPTION = 951000112, MISC_SERVICE_IPC_EXCEPTION = 951000113, - SENSOR_HIDL_SERVICE_EXCEPTION = 951000114, - LIGHT_HIDL_SERVICE_EXCEPTION = 951000115, - VIBRATOR_HIDL_SERVICE_EXCEPTION = 951000116, - SENSOR_DATA_CHANNEL_EXCEPTION = 951000117, + LIGHT_HDF_SERVICE_EXCEPTION = 951000115, + VIBRATOR_HDF_SERVICE_EXCEPTION = 951000116, }; class DmdReport { diff --git a/utils/include/sensors_errors.h b/utils/include/sensors_errors.h old mode 100755 new mode 100644 index a05258d222f0564c75f9db7789f6d3be786dc873..3cc1b651b25d0817e26a091f8ac970de04c0114a --- a/utils/include/sensors_errors.h +++ b/utils/include/sensors_errors.h @@ -22,11 +22,10 @@ namespace OHOS { namespace Sensors { enum { MODULE_COMMON = 0x00, - MODULE_SENSORS_ADAPTER = 0x01, - MODULE_SENSOR_SERVICE = 0x02, - MODULE_SENSORS_UTILS = 0x03, - MODULE_MISCDEVICE_SERVICE = 0x04, - MODULE_SENSORS_NATIVE = 0X05, + MODULE_MISCDEVICE_DEVICE = 0x01, + MODULE_MISCDEVICE_UTILS = 0x02, + MODULE_MISCDEVICE_SERVICE = 0x03, + MODULE_MISCDEVICE_NATIVE = 0X04, }; // Error code for common @@ -39,87 +38,42 @@ enum { }; // Error code for adapter -constexpr ErrCode ADAPTER_ERR_OFFSET = ErrCodeOffset(SUBSYS_SENSORS, MODULE_SENSORS_ADAPTER); +constexpr ErrCode DEVICE_ERR_OFFSET = ErrCodeOffset(SUBSYS_SENSORS, MODULE_MISCDEVICE_DEVICE); enum { - ADAPTER_ERR = ADAPTER_ERR_OFFSET, - ADAPTER_ENABLE_SENSOR_ERR = ADAPTER_ERR_OFFSET + 1, - ADAPTER_DISABLE_SENSOR_ERR = ADAPTER_ENABLE_SENSOR_ERR + 1, - ADAPTER_RUN_COMMAND_ERR = ADAPTER_DISABLE_SENSOR_ERR + 1, - ADAPTER_SET_SENSOR_CONFIG_ERR = ADAPTER_RUN_COMMAND_ERR + 1, - ADAPTER_NOT_SUPPORT_CMD_ERR = ADAPTER_SET_SENSOR_CONFIG_ERR + 1, -}; - -// Error code for sensor service -constexpr ErrCode SENSOR_SERVICE_ERR_OFFSET = ErrCodeOffset(SUBSYS_SENSORS, MODULE_SENSOR_SERVICE); - -enum { - SENSOR_SERVICE_ERR = SENSOR_SERVICE_ERR_OFFSET, - CMD_TYPE_ERR = SENSOR_SERVICE_ERR + 1, - SENSOR_DEVICE_INIT_ERR = CMD_TYPE_ERR + 1, - CONNECT_SENSOR_HIDL_ERR = SENSOR_DEVICE_INIT_ERR + 1, - SET_SENSOR_CONFIG_ERR = CONNECT_SENSOR_HIDL_ERR + 1, - ENABLE_SENSOR_ERR = SET_SENSOR_CONFIG_ERR + 1, - DISABLE_SENSOR_ERR = ENABLE_SENSOR_ERR + 1, - RUN_COMMAND_ERR = DISABLE_SENSOR_ERR + 1, - GET_SENSOR_LIST_ERR = RUN_COMMAND_ERR + 1, - SENSOR_ENABLED_ERR = GET_SENSOR_LIST_ERR + 1, - UPDATE_SENSOR_CHANNEL_ERR = SENSOR_ENABLED_ERR + 1, - CLEAR_SENSOR_CHANNEL_ERR = UPDATE_SENSOR_CHANNEL_ERR + 1, - CLEAR_SENSOR_INFO_ERR = CLEAR_SENSOR_CHANNEL_ERR + 1, - UPDATE_SENSOR_INFO_ERR = CLEAR_SENSOR_INFO_ERR + 1, - CLIENT_PID_INVALID_ERR = UPDATE_SENSOR_INFO_ERR + 1, - DESTROY_SENSOR_CHANNEL_ERR = CLIENT_PID_INVALID_ERR + 1, - UPDATE_UID_ERR = DESTROY_SENSOR_CHANNEL_ERR + 1, - INVALID_POINTER = UPDATE_UID_ERR + 1, - NO_EVENT = INVALID_POINTER + 1, - COPY_ERR = NO_EVENT + 1, - REGIST_PERMISSION_CHANGED_ERR = COPY_ERR + 1, - DUMP_PARAM_ERR = REGIST_PERMISSION_CHANGED_ERR + 1, - WRITE_MSG_ERR = DUMP_PARAM_ERR + 1, + DEVICE_ERR = DEVICE_ERR_OFFSET, + DEVICE_ENABLE_SENSOR_ERR = DEVICE_ERR_OFFSET + 1, + DEVICE_DISABLE_SENSOR_ERR = DEVICE_ENABLE_SENSOR_ERR + 1, + DEVICE_RUN_COMMAND_ERR = DEVICE_DISABLE_SENSOR_ERR + 1, + DEVICE_SET_SENSOR_CONFIG_ERR = DEVICE_RUN_COMMAND_ERR + 1, + DEVICE_NOT_SUPPORT_CMD_ERR = DEVICE_SET_SENSOR_CONFIG_ERR + 1, }; // Error code for miscdevice service constexpr ErrCode MISCDEVICE_SERVICE_ERR_OFFSET = ErrCodeOffset(SUBSYS_SENSORS, MODULE_MISCDEVICE_SERVICE); enum { - LIGHT_HIDL_CONNECT_ERR = MISCDEVICE_SERVICE_ERR_OFFSET, - LIGHT_ID_NOT_SUPPORT = LIGHT_HIDL_CONNECT_ERR + 1, + LIGHT_HDF_CONNECT_ERR = MISCDEVICE_SERVICE_ERR_OFFSET, + LIGHT_ID_NOT_SUPPORT = LIGHT_HDF_CONNECT_ERR + 1, LIGHT_ERR = LIGHT_ID_NOT_SUPPORT + 1, LIGHT_PLAY_EFFECT_ERROR = LIGHT_ERR + 1, LIGHT_STOP_EFFECT_ERROR = LIGHT_PLAY_EFFECT_ERROR + 1, LIGHT_END_ERROR = LIGHT_STOP_EFFECT_ERROR, - VIBRATOR_HIDL_CONNECT_ERR = LIGHT_END_ERROR + 1, - VIBRATOR_ON_ERR = VIBRATOR_HIDL_CONNECT_ERR + 1, + VIBRATOR_HDF_CONNECT_ERR = LIGHT_END_ERROR + 1, + VIBRATOR_ON_ERR = VIBRATOR_HDF_CONNECT_ERR + 1, VIBRATOR_OFF_ERR = VIBRATOR_ON_ERR + 1, VIBRATOR_PLAY_EFFECT_ERR = VIBRATOR_OFF_ERR + 1, VIBRATOR_STOP_EFFECT_ERR = VIBRATOR_PLAY_EFFECT_ERR + 1, VIBRATOR_SET_PARA_ERR = VIBRATOR_STOP_EFFECT_ERR + 1, + WRITE_MSG_ERR = VIBRATOR_SET_PARA_ERR + 1, }; -// Error code for Sensor uitls -constexpr ErrCode SENSOR_UTILS_ERR_OFFSET = ErrCodeOffset(SUBSYS_SENSORS, MODULE_SENSORS_UTILS); -enum { - SENSOR_CHANNEL_SOCKET_CREATE_ERR = SENSOR_UTILS_ERR_OFFSET, - SENSOR_CHANNEL_SENDFD_ERR = SENSOR_CHANNEL_SOCKET_CREATE_ERR + 1, - SENSOR_CHANNEL_WRITE_DESCRIPTOR_ERR = SENSOR_CHANNEL_SENDFD_ERR + 1, - SENSOR_CHANNEL_DUP_ERR = SENSOR_CHANNEL_WRITE_DESCRIPTOR_ERR + 1, - SENSOR_CHANNEL_BASIC_CHANNEL_NOT_INIT = SENSOR_CHANNEL_DUP_ERR + 1, - SENSOR_CHANNEL_SEND_ADDR_ERR = SENSOR_CHANNEL_BASIC_CHANNEL_NOT_INIT + 1, - SENSOR_CHANNEL_SEND_DATA_ERR = SENSOR_CHANNEL_SEND_ADDR_ERR + 1, - SENSOR_CHANNEL_RECEIVE_DATA_ERR = SENSOR_CHANNEL_SEND_DATA_ERR + 1, - SENSOR_CHANNEL_RECEIVE_ADDR_ERR = SENSOR_CHANNEL_RECEIVE_DATA_ERR + 1, - SENSOR_CHANNEL_RESTORE_CB_ERR = SENSOR_CHANNEL_RECEIVE_ADDR_ERR + 1, - SENSOR_CHANNEL_RESTORE_FD_ERR = SENSOR_CHANNEL_RESTORE_CB_ERR + 1, - SENSOR_CHANNEL_RESTORE_THREAD_ERR = SENSOR_CHANNEL_RESTORE_FD_ERR + 1, -}; + // Error code for Sensor native -constexpr ErrCode SENSOR_NATIVE_ERR_OFFSET = ErrCodeOffset(SUBSYS_SENSORS, MODULE_SENSORS_NATIVE); +constexpr ErrCode MISCDEVICE_NATIVE_ERR_OFFSET = ErrCodeOffset(SUBSYS_SENSORS, MODULE_MISCDEVICE_NATIVE); enum { - SENSOR_NATIVE_SAM_ERR = SENSOR_NATIVE_ERR_OFFSET, - SENSOR_NATIVE_GET_SERVICE_ERR = SENSOR_NATIVE_SAM_ERR + 1, - SENSOR_NATIVE_REGSITER_CB_ERR = SENSOR_NATIVE_GET_SERVICE_ERR + 1, - MISC_NATIVE_GET_SERVICE_ERR = SENSOR_NATIVE_REGSITER_CB_ERR + 1, + MISCDEVICE_NATIVE_SAM_ERR = MISCDEVICE_NATIVE_ERR_OFFSET, + MISC_NATIVE_GET_SERVICE_ERR = MISCDEVICE_NATIVE_SAM_ERR + 1, MISC_NATIVE_SAM_ERR = MISC_NATIVE_GET_SERVICE_ERR + 1, }; } // namespace Sensors diff --git a/utils/src/dmd_report.cpp b/utils/src/dmd_report.cpp old mode 100755 new mode 100644 index ed1ed73d6b7c36d0223dc1e5d43697f80cdf0cc7..6831b617097fd31039a36017d5976d9d467c48fa --- a/utils/src/dmd_report.cpp +++ b/utils/src/dmd_report.cpp @@ -31,18 +31,12 @@ constexpr int32_t SECONDS_HALF_HOUR = 1800; } // namespace std::map DmdReport::eventMap_ = { - { JNI_ENV_VAR_EXCEPTION, 0 }, { CLASS_NOT_FOUND, 0 }, { NATIVE_METHOD_REGISTER_EXCEPTION, 0 }, - { JAVA_VM_THREAD_ATTACH_EXCEPTION, 0 }, - { SENSOR_SERVICE_EXCEPTION, 0 }, { MISC_SERVICE_EXCEPTION, 0 }, - { SENSOR_SERVICE_IPC_EXCEPTION, 0 }, { MISC_SERVICE_IPC_EXCEPTION, 0 }, - { SENSOR_HIDL_SERVICE_EXCEPTION, 0 }, - { LIGHT_HIDL_SERVICE_EXCEPTION, 0 }, - { VIBRATOR_HIDL_SERVICE_EXCEPTION, 0 }, - { SENSOR_DATA_CHANNEL_EXCEPTION, 0 }, + { LIGHT_HDF_SERVICE_EXCEPTION, 0 }, + { VIBRATOR_HDF_SERVICE_EXCEPTION, 0 }, }; std::mutex DmdReport::eventMutex_; @@ -50,30 +44,18 @@ std::mutex DmdReport::eventMutex_; static std::string GetEventName(int32_t eventId) { switch (eventId) { - case JNI_ENV_VAR_EXCEPTION: - return "JniEnvVarException"; case CLASS_NOT_FOUND: return "ClassNotFound"; case NATIVE_METHOD_REGISTER_EXCEPTION: return "NativeMethodRegisterException"; - case JAVA_VM_THREAD_ATTACH_EXCEPTION: - return "JavaVmThreadAttachException"; - case SENSOR_SERVICE_EXCEPTION: - return "SensorServiceException"; case MISC_SERVICE_EXCEPTION: return "MiscServiceException"; - case SENSOR_SERVICE_IPC_EXCEPTION: - return "SensorServiceIpcException"; case MISC_SERVICE_IPC_EXCEPTION: return "MiscServiceIpcException"; - case SENSOR_HIDL_SERVICE_EXCEPTION: - return "SensorHidlServiceException"; - case LIGHT_HIDL_SERVICE_EXCEPTION: - return "LightHidlServiceException"; - case VIBRATOR_HIDL_SERVICE_EXCEPTION: - return "VibratorHidlServiceException"; - case SENSOR_DATA_CHANNEL_EXCEPTION: - return "SensorDataChannelException"; + case LIGHT_HDF_SERVICE_EXCEPTION: + return "LightHdfServiceException"; + case VIBRATOR_HDF_SERVICE_EXCEPTION: + return "VibratorHdfServiceException"; default: return ""; }