openharmony/accessibility
1
0
Fork 0
mirror of https://github.com/openharmony/accessibility.git synced 2026-08-25 11:51:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

!2026 部分字符常量从string修改为const char *，减少内存占用和拷贝

Browse Source 
Merge pull request !2026 from taojuncun/bug_20250804_01
This commit is contained in:
openharmony_ci
2025-08-04 11:27:24 +00:00
committed by Gitee
parent fd08c62cf1 dc73397f7b
commit d41ebbe06d
6 changed files with 117 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/innerkits/common/include/accessibility_def.h
+16
View File
@@ -412,6 +412,22 @@ constexpr int32_t US_TO_MS = 1000;
constexpr float COMPLEX_UNIT_MM_CONVERSION = 1.0f / 25.4f;
constexpr int32_t MM_PER_CM = 10;
const char ERROR_MESSAGE_PARAMETER_ERROR[] = "Parameter error. Possible causes:"
"1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed.";
const char ERROR_MESSAGE_NO_PERMISSION[] = "Permission verification failed."
"The application does not have the permission required to call the API.";
const char ERROR_MESSAGE_NOT_SYSTEM_APP[] = "Permission verification failed."
"A non-system application calls a system API.";
const char ERROR_MESSAGE_NO_RIGHT[] = "No accessibility permission to perform the operation";
const char ERROR_MESSAGE_SYSTEM_ABNORMALITY[] = "System abnormality";
const char ERROR_MESSAGE_PROPERTY_NOT_EXIST[] = "This property does not exist";
const char ERROR_MESSAGE_ACTION_NOT_SUPPORT[] = "This action is not supported";
const char ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME[] = "Invalid bundle name or ability name";
const char ERROR_MESSAGE_TARGET_ABILITY_ALREADY_ENABLED[] = "Target ability already enabled";
const char ERROR_MESSAGE_ENABLE_MAGNIFICATION[] = "Failed to trigger magnification.";
const char ERROR_MESSAGE_CAPABILITY_NOT_SUPPORT[] = "Capability not supported."
"Failed to call the API due to limited device capabilities.";
enum class NAccessibilityErrorCode : int32_t {
ACCESSIBILITY_OK = 0,
ACCESSIBILITY_ERROR_NO_PERMISSION = 201,
interfaces/kits/ani/src/accessibility_utils_ani.cpp
-14
View File
@@ -23,20 +23,6 @@
namespace OHOS {
namespace AccessibilityAni {
namespace {
const std::string ERROR_MESSAGE_PARAMETER_ERROR = "Parameter error. Possible causes:"
"1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed.";
const std::string ERROR_MESSAGE_NO_PERMISSION = "Permission verification failed."
"The application does not have the permission required to call the API.";
const std::string ERROR_MESSAGE_NOT_SYSTEM_APP = "Permission verification failed."
"A non-system application calls a system API.";
const std::string ERROR_MESSAGE_NO_RIGHT = "No accessibility permission to perform the operation";
const std::string ERROR_MESSAGE_SYSTEM_ABNORMALITY = "System abnormality";
const std::string ERROR_MESSAGE_PROPERTY_NOT_EXIST = "This property does not exist";
const std::string ERROR_MESSAGE_ACTION_NOT_SUPPORT = "This action is not supported";
const std::string ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME = "Invalid bundle name or ability name";
const std::string ERROR_MESSAGE_TARGET_ABILITY_ALREADY_ENABLED = "Target ability already enabled";
} // namespace
using namespace OHOS::Accessibility;
using namespace arkts::ani_signature;
interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp
-3
View File
@@ -32,9 +32,6 @@ using namespace OHOS::AccessibilityNapi;
namespace OHOS {
namespace Accessibility {
namespace {
const std::string ERROR_MESSAGE_PARAMETER_ERROR = "Parameter error. Possible causes:"
"1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed.";
const std::string ERROR_MESSAGE_SYSTEM_ABNORMALITY = "System abnormality";
static void ConvertAccessibilityWindowInfoToJS(
napi_env env, napi_value result, const AccessibilityWindowInfo& accessibilityWindowInfo)
interfaces/kits/napi/src/napi_accessibility_utils.cpp
-16
View File
@@ -54,22 +54,6 @@ namespace {
const std::string HALF_VALUE = "0";
const std::string FULL_VALUE = "1";
const std::string NUMBER_VALID_CHARS = "0123456789ABCDEFabcdef";
const std::string ERROR_MESSAGE_PARAMETER_ERROR = "Parameter error. Possible causes:"
"1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed.";
const std::string ERROR_MESSAGE_NO_PERMISSION = "Permission verification failed."
"The application does not have the permission required to call the API.";
const std::string ERROR_MESSAGE_NOT_SYSTEM_APP = "Permission verification failed."
"A non-system application calls a system API.";
const std::string ERROR_MESSAGE_NO_RIGHT = "No accessibility permission to perform the operation";
const std::string ERROR_MESSAGE_SYSTEM_ABNORMALITY = "System abnormality";
const std::string ERROR_MESSAGE_PROPERTY_NOT_EXIST = "This property does not exist";
const std::string ERROR_MESSAGE_ACTION_NOT_SUPPORT = "This action is not supported";
const std::string ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME = "Invalid bundle name or ability name";
const std::string ERROR_MESSAGE_TARGET_ABILITY_ALREADY_ENABLED = "Target ability already enabled";
const std::string ERROR_MESSAGE_ENABLE_MAGNIFICATION = "Failed to trigger magnification.";
const std::string ERROR_MESSAGE_CAPABILITY_NOT_SUPPORT = "Capability not supported."
"Failed to call the API due to limited device capabilities.";
} // namespace
using namespace OHOS::Accessibility;
using namespace OHOS::AccessibilityConfig;
services/aams/src/accessibility_settings_config.cpp
+60 -60
View File
@@ -31,60 +31,60 @@ namespace {
const int32_t SHORT_KEY_TIMEOUT_AFTER_USE = 1000; // ms
const int32_t SHORT_KEY_TIMEOUT_BEFORE_USE = 3000; // ms
const int32_t DEFAULT_ACCOUNT_ID = 100;
const std::string ACCESSIBILITY = "accessibility";
const std::string TOUCH_GUIDE_STATE = "touch_guide_state";
const std::string GESTURE_KEY = "gesture_state";
const std::string CAPTION_KEY = "caption_state";
const std::string KEYEVENT_OBSERVER = "keyevent_observer";
const std::string SCREEN_MAGNIFICATION_KEY = "accessibility_display_magnification_enabled";
const std::string SCREEN_MAGNIFICATION_TYPE = "accessibility_magnification_capability";
const std::string SCREEN_MAGNIFICATION_MODE = "accessibility_magnification_mode";
const std::string SCREEN_MAGNIFICATION_SCALE = "accessibility_display_magnification_scale";
const std::string MOUSEKEY = "mousekey";
const std::string HIGH_CONTRAST_TEXT_KEY = "high_text_contrast_enabled";
const std::string DALTONIZATION_STATE = "accessibility_display_daltonizer_enabled";
const std::string INVERT_COLOR_KEY = "accessibility_display_inversion_enabled";
const std::string ANIMATION_OFF_KEY = "animation_off";
const std::string AUDIO_MONO_KEY = "master_mono";
const std::string IGNORE_REPEAT_CLICK_SWITCH = "ignore_repeat_click_switch";
const std::string SHORTCUT_ENABLED = "accessibility_shortcut_enabled";
const std::string SHORTCUT_SERVICE = "accessibility_shortcut_target_service";
const std::string CLICK_RESPONCE_TIME = "click_response_time";
const std::string IGNORE_REPEAT_CLICK_TIME = "ignore_repeat_click_time";
const std::string DALTONIZATION_COLOR_FILTER_KEY = "accessibility_display_daltonizer";
const std::string CONTENT_TIMEOUT_KEY = "accessibility_content_timeout";
const std::string BRIGHTNESS_DISCOUNT_KEY = "accessibility_brightness_discount";
const std::string AUDIO_BALANCE_KEY = "master_balance";
const std::string FONT_FAMILY = "accessibility_font_family";
const std::string FONT_COLOR = "accessibility_font_color";
const std::string FONT_EDGE_TYPE = "accessibility_font_edge_type";
const std::string BACKGROUND_COLOR = "accessibility_background_color";
const std::string WINDOW_COLOR = "accessibility_window_color";
const std::string FONT_SCALE = "accessibility_font_scale";
const std::string ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";
const std::string SHORTCUT_ENABLED_ON_LOCK_SCREEN = "accessibility_shortcut_enabled_on_lock_screen"; // HMOS key
const std::string SHORTCUT_ON_LOCK_SCREEN = "accessibility_shortcut_on_lock_screen"; // AOS key
const std::string SHORTCUT_TIMEOUT = "accessibility_shortcut_timeout";
const std::string ACCESSIBILITY_CLONE_FLAG = "accessibility_config_clone";
const std::string SCREENREADER_TAG = "screenreader";
const std::string INVERT_COLOR_AOS_TAG = "ColorInversion";
const std::string INVERT_COLOR_HMOS_TAG = "INVERT_COLOR";
const std::string AUDIO_MONO_HMOS_TAG = "AUDIO_MONO";
const std::string HIGH_CONTRAST_TEXT_HMOS_TAG = "HIGH_CONTRAST_TEXT";
const std::string SCREEN_READER_BUNDLE_ABILITY_NAME = "com.huawei.hmos.screenreader/AccessibilityExtAbility";
const std::string ACCESSIBILITY_SCREENREADER_ENABLED = "accessibility_screenreader_enabled";
const std::string ACCESSIBILITY_PRIVACY_CLONE_OR_UPGRADE = "accessibility_privacy_clone_or_upgrade";
const std::string IGNORE_REPEAT_CLICK_RECONFIRM = "accessibility_ignore_repeat_click_reconfirm";
const std::string ZOOM_GESTURE_ENABLED_RECONFIRM = "accessibility_zoom_gesture_enabled_reconfirm";
const std::string GRAPHIC_ANIMATION_SCALE_NAME = "persist.sys.graphic.animationscale";
const std::string ARKUI_ANIMATION_SCALE_NAME = "persist.sys.arkui.animationscale";
const std::string FLASH_REMINDER_SWITCH_KEY = "accessibility_flash_reminder_switch";
const std::string FLASH_REMINDER_ENABLED = "accessibility_reminder_function_enabled";
const std::string VOICE_RECOGNITION_KEY = "accessibility_sound_recognition_switch";
const std::string VOICE_RECOGNITION_TYPES = "accessibility_sound_recognition_enabled";
const std::string IGNORE_REPEAT_CLICK_TIMESTAMP = "accessibility_ignore_repeat_click_timestamp";
const std::string RECOVERY_IGNORE_REPEAT_CLICK_DATE = "recovery_ignore_repeat_click_switch_date";
const std::string IGNORE_REPEATED_CLICK_CACHE_FLAG = "accessibility_ignore_repeat_click_cache_flag";
const char* ACCESSIBILITY = "accessibility";
const char* TOUCH_GUIDE_STATE = "touch_guide_state";
const char* GESTURE_KEY = "gesture_state";
const char* CAPTION_KEY = "caption_state";
const char* KEYEVENT_OBSERVER = "keyevent_observer";
const char* SCREEN_MAGNIFICATION_KEY = "accessibility_display_magnification_enabled";
const char* SCREEN_MAGNIFICATION_TYPE = "accessibility_magnification_capability";
const char* SCREEN_MAGNIFICATION_MODE = "accessibility_magnification_mode";
const char* SCREEN_MAGNIFICATION_SCALE = "accessibility_display_magnification_scale";
const char* MOUSEKEY = "mousekey";
const char* HIGH_CONTRAST_TEXT_KEY = "high_text_contrast_enabled";
const char* DALTONIZATION_STATE = "accessibility_display_daltonizer_enabled";
const char* INVERT_COLOR_KEY = "accessibility_display_inversion_enabled";
const char* ANIMATION_OFF_KEY = "animation_off";
const char* AUDIO_MONO_KEY = "master_mono";
const char* IGNORE_REPEAT_CLICK_SWITCH = "ignore_repeat_click_switch";
const char* SHORTCUT_ENABLED = "accessibility_shortcut_enabled";
const char* SHORTCUT_SERVICE = "accessibility_shortcut_target_service";
const char* CLICK_RESPONCE_TIME = "click_response_time";
const char* IGNORE_REPEAT_CLICK_TIME = "ignore_repeat_click_time";
const char* DALTONIZATION_COLOR_FILTER_KEY = "accessibility_display_daltonizer";
const char* CONTENT_TIMEOUT_KEY = "accessibility_content_timeout";
const char* BRIGHTNESS_DISCOUNT_KEY = "accessibility_brightness_discount";
const char* AUDIO_BALANCE_KEY = "master_balance";
const char* FONT_FAMILY = "accessibility_font_family";
const char* FONT_COLOR = "accessibility_font_color";
const char* FONT_EDGE_TYPE = "accessibility_font_edge_type";
const char* BACKGROUND_COLOR = "accessibility_background_color";
const char* WINDOW_COLOR = "accessibility_window_color";
const char* FONT_SCALE = "accessibility_font_scale";
const char* ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";
const char* SHORTCUT_ENABLED_ON_LOCK_SCREEN = "accessibility_shortcut_enabled_on_lock_screen"; // HMOS key
const char* SHORTCUT_ON_LOCK_SCREEN = "accessibility_shortcut_on_lock_screen"; // AOS key
const char* SHORTCUT_TIMEOUT = "accessibility_shortcut_timeout";
const char* ACCESSIBILITY_CLONE_FLAG = "accessibility_config_clone";
const char* SCREENREADER_TAG = "screenreader";
const char* INVERT_COLOR_AOS_TAG = "ColorInversion";
const char* INVERT_COLOR_HMOS_TAG = "INVERT_COLOR";
const char* AUDIO_MONO_HMOS_TAG = "AUDIO_MONO";
const char* HIGH_CONTRAST_TEXT_HMOS_TAG = "HIGH_CONTRAST_TEXT";
const char* SCREEN_READER_BUNDLE_ABILITY_NAME = "com.huawei.hmos.screenreader/AccessibilityExtAbility";
const char* ACCESSIBILITY_SCREENREADER_ENABLED = "accessibility_screenreader_enabled";
const char* ACCESSIBILITY_PRIVACY_CLONE_OR_UPGRADE = "accessibility_privacy_clone_or_upgrade";
const char* IGNORE_REPEAT_CLICK_RECONFIRM = "accessibility_ignore_repeat_click_reconfirm";
const char* ZOOM_GESTURE_ENABLED_RECONFIRM = "accessibility_zoom_gesture_enabled_reconfirm";
const char* GRAPHIC_ANIMATION_SCALE_NAME = "persist.sys.graphic.animationscale";
const char* ARKUI_ANIMATION_SCALE_NAME = "persist.sys.arkui.animationscale";
const char* FLASH_REMINDER_SWITCH_KEY = "accessibility_flash_reminder_switch";
const char* FLASH_REMINDER_ENABLED = "accessibility_reminder_function_enabled";
const char* VOICE_RECOGNITION_KEY = "accessibility_sound_recognition_switch";
const char* VOICE_RECOGNITION_TYPES = "accessibility_sound_recognition_enabled";
const char* IGNORE_REPEAT_CLICK_TIMESTAMP = "accessibility_ignore_repeat_click_timestamp";
const char* RECOVERY_IGNORE_REPEAT_CLICK_DATE = "recovery_ignore_repeat_click_switch_date";
const char* IGNORE_REPEATED_CLICK_CACHE_FLAG = "accessibility_ignore_repeat_click_cache_flag";
constexpr int DOUBLE_CLICK_RESPONSE_TIME_MEDIUM = 300;
constexpr int DOUBLE_IGNORE_REPEAT_CLICK_TIME_SHORTEST = 100;
constexpr int DOUBLE_IGNORE_REPEAT_CLICK_TIME_SHORT = 400;
@@ -1043,15 +1043,15 @@ void AccessibilitySettingsConfig::InitPrivacySpaceConfig()
void AccessibilitySettingsConfig::InitAnimationOffConfig()
{
animationOffState_ = datashare_->GetBoolValue(ANIMATION_OFF_KEY, false);
std::string graphicState = system::GetParameter(GRAPHIC_ANIMATION_SCALE_NAME.c_str(), "1");
std::string arkuiState = system::GetParameter(ARKUI_ANIMATION_SCALE_NAME.c_str(), "1");
std::string graphicState = system::GetParameter(GRAPHIC_ANIMATION_SCALE_NAME, "1");
std::string arkuiState = system::GetParameter(ARKUI_ANIMATION_SCALE_NAME, "1");
bool state = (graphicState == "0" && arkuiState == "0");
if (animationOffState_) {
system::SetParameter(GRAPHIC_ANIMATION_SCALE_NAME.c_str(), "0");
system::SetParameter(ARKUI_ANIMATION_SCALE_NAME.c_str(), "0");
system::SetParameter(GRAPHIC_ANIMATION_SCALE_NAME, "0");
system::SetParameter(ARKUI_ANIMATION_SCALE_NAME, "0");
} else if (!animationOffState_ && state) {
system::SetParameter(GRAPHIC_ANIMATION_SCALE_NAME.c_str(), "1");
system::SetParameter(ARKUI_ANIMATION_SCALE_NAME.c_str(), "1");
system::SetParameter(GRAPHIC_ANIMATION_SCALE_NAME, "1");
system::SetParameter(ARKUI_ANIMATION_SCALE_NAME, "1");
}
}
services/aams/src/accessible_ability_manager_service.cpp
+41 -41
View File
@@ -64,32 +64,32 @@ using namespace OHOS::AccessibilityConfig;
namespace OHOS {
namespace Accessibility {
namespace {
const std::string AAMS_SERVICE_NAME = "AccessibleAbilityManagerService";
const std::string AAMS_ACTION_RUNNER_NAME = "AamsActionRunner";
const std::string AAMS_SEND_EVENT_RUNNER_NAME = "AamsSendEventRunner";
const std::string AAMS_CHANNEL_RUNNER_NAME = "AamsChannelRunner";
const std::string AAMS_INPUT_MANAGER_RUNNER_NAME = "AamsInputManagerRunner";
const std::string AAMS_GESTURE_RUNNER_NAME = "AamsGestureRunner";
const std::string AAMS_HOVER_ENTER_RUNNER_NAME = "AamsHoverEnterRunner";
const std::string AAMS_REGISTER_RUNNER_NAME = "AamsRegisterRunner";
const std::string SYSTEM_PARAMETER_AAMS_NAME = "accessibility.config.ready";
const std::string SCREEN_READER_BUNDLE_ABILITY_NAME = "com.huawei.hmos.screenreader/AccessibilityExtAbility";
const std::string DEVICE_PROVISIONED = "device_provisioned";
const std::string SCREEN_MAGNIFICATION_KEY = "accessibility_display_magnification_enabled";
const std::string SCREEN_MAGNIFICATION_TYPE = "accessibility_magnification_capability";
const std::string SCREEN_MAGNIFICATION_MODE = "accessibility_magnification_mode";
const std::string SCREEN_MAGNIFICATION_SCALE = "accessibility_display_magnification_scale";
const std::string MAGNIFICATION_PARAM = "const.accessibility.magnification";
const std::string VOICE_RECOGNITION_KEY = "accessibility_sound_recognition_switch";
const std::string VOICE_RECOGNITION_TYPES = "accessibility_sound_recognition_enabled";
const std::string DELAY_UNLOAD_TASK = "TASK_UNLOAD_ACCESSIBILITY_SA";
const std::string USER_SETUP_COMPLETED = "user_setup_complete";
const std::string ACCESSIBILITY_CLONE_FLAG = "accessibility_config_clone";
const std::string SHORTCUT_ENABLED = "accessibility_shortcut_enabled";
const std::string HAP_PATH = "/system/app/Settings/Settings.hap";
const std::string HAP_BUNDLE = "com.ohos.settings";
const std::string UI_TEST_BUNDLE_NAME = "ohos.uitest";
const std::string UI_TEST_ABILITY_NAME = "uitestability";
const char* AAMS_SERVICE_NAME = "AccessibleAbilityManagerService";
const char* AAMS_ACTION_RUNNER_NAME = "AamsActionRunner";
const char* AAMS_SEND_EVENT_RUNNER_NAME = "AamsSendEventRunner";
const char* AAMS_CHANNEL_RUNNER_NAME = "AamsChannelRunner";
const char* AAMS_INPUT_MANAGER_RUNNER_NAME = "AamsInputManagerRunner";
const char* AAMS_GESTURE_RUNNER_NAME = "AamsGestureRunner";
const char* AAMS_HOVER_ENTER_RUNNER_NAME = "AamsHoverEnterRunner";
const char* AAMS_REGISTER_RUNNER_NAME = "AamsRegisterRunner";
const char* SYSTEM_PARAMETER_AAMS_NAME = "accessibility.config.ready";
const char* SCREEN_READER_BUNDLE_ABILITY_NAME = "com.huawei.hmos.screenreader/AccessibilityExtAbility";
const char* DEVICE_PROVISIONED = "device_provisioned";
const char* SCREEN_MAGNIFICATION_KEY = "accessibility_display_magnification_enabled";
const char* SCREEN_MAGNIFICATION_TYPE = "accessibility_magnification_capability";
const char* SCREEN_MAGNIFICATION_MODE = "accessibility_magnification_mode";
const char* SCREEN_MAGNIFICATION_SCALE = "accessibility_display_magnification_scale";
const char* MAGNIFICATION_PARAM = "const.accessibility.magnification";
const char* VOICE_RECOGNITION_KEY = "accessibility_sound_recognition_switch";
const char* VOICE_RECOGNITION_TYPES = "accessibility_sound_recognition_enabled";
const char* DELAY_UNLOAD_TASK = "TASK_UNLOAD_ACCESSIBILITY_SA";
const char* USER_SETUP_COMPLETED = "user_setup_complete";
const char* ACCESSIBILITY_CLONE_FLAG = "accessibility_config_clone";
const char* SHORTCUT_ENABLED = "accessibility_shortcut_enabled";
const char* HAP_PATH = "/system/app/Settings/Settings.hap";
const char* HAP_BUNDLE = "com.ohos.settings";
const char* UI_TEST_BUNDLE_NAME = "ohos.uitest";
const char* UI_TEST_ABILITY_NAME = "uitestability";
constexpr int32_t INVALID_SHORTCUT_STATE = 2;
constexpr int32_t QUERY_USER_ID_RETRY_COUNT = 600;
constexpr int32_t QUERY_USER_ID_SLEEP_TIME = 50;
@@ -110,15 +110,15 @@ namespace {
OFF = 0,
ON = 1,
};
const std::string TIMER_REGISTER_STATE_OBSERVER = "accessibility:registerStateObServer";
const std::string TIMER_REGISTER_CAPTION_OBSERVER = "accessibility:registerCaptionObServer";
const std::string TIMER_REGISTER_ENABLEABILITY_OBSERVER = "accessibility:registerEnableAbilityObServer";
const std::string TIMER_GET_ALL_CONFIG = "accessibility:getAllConfig";
const std::string TIMER_REGISTER_CONFIG_OBSERVER = "accessibility:registerConfigObserver";
const std::string MAGNIFICATION_SCALE = "magnification_scale";
const std::string MAGNIFICATION_DISABLE = "magnification_disabled";
const std::string SWITCH_FULL_SCREEN = "switch_full_screen_magnification";
const std::string SWITCH_WINDOW = "switch_window_magnification";
const char* TIMER_REGISTER_STATE_OBSERVER = "accessibility:registerStateObServer";
const char* TIMER_REGISTER_CAPTION_OBSERVER = "accessibility:registerCaptionObServer";
const char* TIMER_REGISTER_ENABLEABILITY_OBSERVER = "accessibility:registerEnableAbilityObServer";
const char* TIMER_GET_ALL_CONFIG = "accessibility:getAllConfig";
const char* TIMER_REGISTER_CONFIG_OBSERVER = "accessibility:registerConfigObserver";
const char* MAGNIFICATION_SCALE = "magnification_scale";
const char* MAGNIFICATION_DISABLE = "magnification_disabled";
const char* SWITCH_FULL_SCREEN = "switch_full_screen_magnification";
const char* SWITCH_WINDOW = "switch_window_magnification";
constexpr int32_t XCOLLIE_TIMEOUT = 6; // s
constexpr int QUANTITY = 2; // plural string
@@ -309,7 +309,7 @@ void AccessibleAbilityManagerService::OnStart()
InitGestureHandler();
InitHoverEnterHandler();
SetParameter(SYSTEM_PARAMETER_AAMS_NAME.c_str(), "false");
SetParameter(SYSTEM_PARAMETER_AAMS_NAME, "false");
HILOG_DEBUG("AddAbilityListener!");
AddSystemAbilityListener(ABILITY_MGR_SERVICE_ID);
@@ -362,7 +362,7 @@ void AccessibleAbilityManagerService::OnStop()
isReady_ = false;
isPublished_ = false;
SetParameter(SYSTEM_PARAMETER_AAMS_NAME.c_str(), "false");
SetParameter(SYSTEM_PARAMETER_AAMS_NAME, "false");
int pid = getpid();
Memory::MemMgrClient::GetInstance().NotifyProcessStatus(pid, 1, 0, ACCESSIBILITY_MANAGER_SERVICE_ID);
HILOG_INFO("AccessibleAbilityManagerService::OnStop OK.");
@@ -411,7 +411,7 @@ void AccessibleAbilityManagerService::OnAddSystemAbility(int32_t systemAbilityId
InitInnerResource();
isReady_ = true;
SetParameter(SYSTEM_PARAMETER_AAMS_NAME.c_str(), "true");
SetParameter(SYSTEM_PARAMETER_AAMS_NAME, "true");
HILOG_DEBUG("AAMS is ready!");
RegisterShortKeyEvent();
PostDelayUnloadTask();
@@ -452,7 +452,7 @@ void AccessibleAbilityManagerService::OnRemoveSystemAbility(int32_t systemAbilit
Singleton<AccessibilityWindowManager>::GetInstance().DeInit();
isReady_ = false;
SetParameter(SYSTEM_PARAMETER_AAMS_NAME.c_str(), "false");
SetParameter(SYSTEM_PARAMETER_AAMS_NAME, "false");
}
if (systemAbilityId == DISTRIBUTED_KV_DATA_SERVICE_ABILITY_ID) {
@@ -3668,7 +3668,7 @@ void AccessibleAbilityManagerService::PostDelayUnloadTask()
HILOG_ERROR("unload system ability failed");
return;
}
SetParameter(SYSTEM_PARAMETER_AAMS_NAME.c_str(), "false");
SetParameter(SYSTEM_PARAMETER_AAMS_NAME, "false");
};
handler_->RemoveTask(DELAY_UNLOAD_TASK);
handler_->PostTask(task, DELAY_UNLOAD_TASK, UNLOAD_TASK_INTERNAL);
@@ -4170,7 +4170,7 @@ void AccessibleAbilityManagerService::InitResource(bool needReInit)
resConfig->SetLocaleInfo(language.c_str(), script.c_str(), region.c_str());
resourceManager->UpdateResConfig(*resConfig);
if (!resourceManager->AddResource(HAP_PATH.c_str())) {
if (!resourceManager->AddResource(HAP_PATH)) {
HILOG_ERROR("AddResource failed");
return;
}