From 12f86f731d2953e77e4fa2d3ee96fce2509d14b3 Mon Sep 17 00:00:00 2001 From: zyr020212 Date: Fri, 9 Jan 2026 13:54:34 +0800 Subject: [PATCH 1/2] Sensitive word remove Signed-off-by: zyr020212 --- services/abilitymgr/include/utils/ability_util.h | 2 +- services/abilitymgr/src/ability_connect_manager.cpp | 4 ++-- services/appmgr/src/app_state_observer_manager.cpp | 2 +- .../src/bundlemgr/mock_app_control_manager.cpp | 2 +- .../ability_connect_manager_second_test.cpp | 4 ++-- .../ability_manager_service_sixth_test.cpp | 4 ++-- test/unittest/ability_record_test/ability_record_test.cpp | 2 +- .../app_running_manager_test/app_running_manager_test.cpp | 2 +- .../modal_system_app_freeze_uiextension_test/BUILD.gn | 1 - .../start_other_app_interceptor_test.cpp | 2 +- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/services/abilitymgr/include/utils/ability_util.h b/services/abilitymgr/include/utils/ability_util.h index 720f3ba972..b083b670aa 100644 --- a/services/abilitymgr/include/utils/ability_util.h +++ b/services/abilitymgr/include/utils/ability_util.h @@ -47,7 +47,7 @@ constexpr const char* DLP_PARAMS_BUNDLE_NAME = "ohos.dlp.params.bundleName"; constexpr const char* DLP_PARAMS_MODULE_NAME = "ohos.dlp.params.moduleName"; constexpr const char* DLP_PARAMS_ABILITY_NAME = "ohos.dlp.params.abilityName"; #endif // WITH_DLP -constexpr const char* MARKET_BUNDLE_NAME = "com.huawei.hmsapp.appgallery"; +constexpr const char* MARKET_BUNDLE_NAME = "com.hmsapp.appgallery"; constexpr const char* MARKET_CROWD_TEST_BUNDLE_PARAM = "crowd_test_bundle_name"; constexpr const char* BUNDLE_NAME_SELECTOR_DIALOG = "com.ohos.amsdialog"; constexpr const char* JUMP_INTERCEPTOR_DIALOG_CALLER_PKG = "interceptor_callerPkg"; diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index d7a6a3ac76..c85bd82fff 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -73,7 +73,7 @@ const int COMMAND_WINDOW_TIMEOUT_MULTIPLE = 5; #endif constexpr const int32_t LOAD_TIMEOUT_MAX = 30; const int32_t AUTO_DISCONNECT_INFINITY = -1; -constexpr const char* FROZEN_WHITE_DIALOG = "com.huawei.hmos.huaweicast"; +constexpr const char* FROZEN_WHITE_DIALOG = "com.hmos.cast"; constexpr char BUNDLE_NAME_DIALOG[] = "com.ohos.amsdialog"; constexpr char ABILITY_NAME_ASSERT_FAULT_DIALOG[] = "AssertFaultDialog"; constexpr const char* WANT_PARAMS_APP_RESTART_FLAG = "ohos.aafwk.app.restart"; @@ -83,7 +83,7 @@ constexpr int32_t HALF_TIMEOUT = 2; constexpr uint32_t PROCESS_MODE_RUN_WITH_MAIN_PROCESS = 1 << static_cast(AppExecFwk::ExtensionProcessMode::RUN_WITH_MAIN_PROCESS); -const std::string XIAOYI_BUNDLE_NAME = "com.huawei.hmos.vassistant"; +const std::string XIAOYI_BUNDLE_NAME = "com.hmos.vassistant"; } diff --git a/services/appmgr/src/app_state_observer_manager.cpp b/services/appmgr/src/app_state_observer_manager.cpp index 4d73b9da79..a9a377e2b5 100644 --- a/services/appmgr/src/app_state_observer_manager.cpp +++ b/services/appmgr/src/app_state_observer_manager.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace AppExecFwk { namespace { -const std::string XIAOYI_BUNDLE_NAME = "com.huawei.hmos.vassistant"; +const std::string XIAOYI_BUNDLE_NAME = "com.hmos.vassistant"; constexpr int BUNDLE_NAME_LIST_MAX_SIZE = 128; constexpr int OBSERVER_SINGLE_COUNT_LOG = 40; constexpr int OBSERVER_SINGLE_STEP_LOG = 10; diff --git a/test/mock/services_abilitymgr_test/libs/appexecfwk_core/src/bundlemgr/mock_app_control_manager.cpp b/test/mock/services_abilitymgr_test/libs/appexecfwk_core/src/bundlemgr/mock_app_control_manager.cpp index a271acdc6d..a91c2ecbcf 100644 --- a/test/mock/services_abilitymgr_test/libs/appexecfwk_core/src/bundlemgr/mock_app_control_manager.cpp +++ b/test/mock/services_abilitymgr_test/libs/appexecfwk_core/src/bundlemgr/mock_app_control_manager.cpp @@ -83,7 +83,7 @@ ErrCode AppControlProxy::GetAppRunningControlRule( return ERR_OK; } Want want; - ElementName element("", "com.huawei.hmos.appgallery", "MainAbility"); + ElementName element("", "com.hmos.appgallery", "MainAbility"); want.SetElement(element); controlRuleResult.controlWant = std::make_shared(want); controlRuleResult.controlMessage = "the test app is not available"; diff --git a/test/unittest/ability_connect_manager_second_test/ability_connect_manager_second_test.cpp b/test/unittest/ability_connect_manager_second_test/ability_connect_manager_second_test.cpp index 8baac5baad..c3845485d8 100644 --- a/test/unittest/ability_connect_manager_second_test/ability_connect_manager_second_test.cpp +++ b/test/unittest/ability_connect_manager_second_test/ability_connect_manager_second_test.cpp @@ -29,8 +29,8 @@ using namespace testing::ext; using namespace OHOS::AppExecFwk; namespace { -const std::string VASSISTANT_BUNDLE_NAME = "com.huawei.hmos.vassistant"; -const std::string VASSISTANT_B2 = "com.huawei.hmos.vassistant.test"; +const std::string VASSISTANT_BUNDLE_NAME = "com.hmos.vassistant"; +const std::string VASSISTANT_B2 = "com.hmos.vassistant.test"; constexpr size_t LOAD_TIMEOUT = 0; constexpr size_t ACTIVE_TIMEOUT = 1; constexpr size_t INACTIVE_TIMEOUT = 2; diff --git a/test/unittest/ability_manager_service_sixth_test/ability_manager_service_sixth_test.cpp b/test/unittest/ability_manager_service_sixth_test/ability_manager_service_sixth_test.cpp index 5d24bb753f..5a2be6db3d 100644 --- a/test/unittest/ability_manager_service_sixth_test/ability_manager_service_sixth_test.cpp +++ b/test/unittest/ability_manager_service_sixth_test/ability_manager_service_sixth_test.cpp @@ -83,8 +83,8 @@ constexpr const char* BUNDLE_NAME_LAUNCHER = "com.ohos.launcher"; constexpr const char* BUNDLE_NAME_SCENEBOARD = "com.ohos.sceneboard"; constexpr const char* LAUNCHER_ABILITY_NAME = "com.ohos.launcher.MainAbility"; constexpr const char* SCENEBOARD_ABILITY_NAME = "com.ohos.sceneboard.MainAbility"; -constexpr const char* BUNDLE_NAME_TEST = "com.huawei.hmos.passwordvault"; -constexpr const char* BUNDLE_NAME_SMART_TEST = "com.huawei.hms.textautofill"; +constexpr const char* BUNDLE_NAME_TEST = "com.hmos.passwordvault"; +constexpr const char* BUNDLE_NAME_SMART_TEST = "com.hms.textautofill"; const std::string APP_INSTANCE_KEY("ohos.extra.param.key.appInstance"); const std::string CREATE_APP_INSTANCE_KEY("ohos.extra.param.key.createAppInstance"); constexpr const char* CALLER_REQUEST_CODE = "ohos.extra.param.key.callerRequestCode"; diff --git a/test/unittest/ability_record_test/ability_record_test.cpp b/test/unittest/ability_record_test/ability_record_test.cpp index 1789173ea6..314bd83c5d 100644 --- a/test/unittest/ability_record_test/ability_record_test.cpp +++ b/test/unittest/ability_record_test/ability_record_test.cpp @@ -61,7 +61,7 @@ const std::string DEBUG_APP = "debugApp"; #ifdef WITH_DLP const std::string DLP_BUNDLE_NAME = "com.ohos.dlpmanager"; #endif // WITH_DLP -const std::string SHELL_ASSISTANT_BUNDLENAME = "com.huawei.shell_assistant"; +const std::string SHELL_ASSISTANT_BUNDLENAME = "com.shell_assistant"; const std::string SHOW_ON_LOCK_SCREEN = "ShowOnLockScreen"; const std::string URI_PERMISSION_TABLE_NAME = "uri_permission"; constexpr const char* UIEXTENSION_LAUNCH_TIMESTAMP_HIGH = "ohos.ability.params.uiExtensionLaunchTimestampHigh"; diff --git a/test/unittest/app_running_manager_test/app_running_manager_test.cpp b/test/unittest/app_running_manager_test/app_running_manager_test.cpp index ada8b68145..c0b0fe39d0 100644 --- a/test/unittest/app_running_manager_test/app_running_manager_test.cpp +++ b/test/unittest/app_running_manager_test/app_running_manager_test.cpp @@ -267,7 +267,7 @@ HWTEST_F(AppRunningManagerTest, AppRunningManager_UpdateConfiguration_0100, Test appRunningManager->appRunningRecordMap_.emplace(++recordId, nullptr); appRunningRecord->SetState(ApplicationState::APP_STATE_READY); appRunningManager->appRunningRecordMap_.emplace(++recordId, appRunningRecord); - appInfo->name = "com.huawei.shell_assistant"; + appInfo->name = "com.shell_assistant"; appRunningRecord = std::make_shared(appInfo, recordId, processName); appRunningManager->appRunningRecordMap_.emplace(++recordId, appRunningRecord); EXPECT_EQ(appRunningManager->appRunningRecordMap_.size(), recordId); diff --git a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn index be0fc606e5..32c8dd4074 100644 --- a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn +++ b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn @@ -19,7 +19,6 @@ ohos_unittest("modal_system_app_freeze_uiextension_test") { defines = [ "APP_NO_RESPONSE_DIALOG=1", - "APP_NO_RESPONSE_BUNDLENAME=\"com.huawei.hmos.abnormal\"", ] include_dirs = [ diff --git a/test/unittest/start_other_app_interceptor_test/start_other_app_interceptor_test.cpp b/test/unittest/start_other_app_interceptor_test/start_other_app_interceptor_test.cpp index 2dac6706a7..73a447c3df 100644 --- a/test/unittest/start_other_app_interceptor_test/start_other_app_interceptor_test.cpp +++ b/test/unittest/start_other_app_interceptor_test/start_other_app_interceptor_test.cpp @@ -110,7 +110,7 @@ HWTEST_F(StartOtherAppInterceptorTest, CheckAncoShellCall_001, TestSize.Level1) auto interceptor = std::make_shared(); AppExecFwk::ApplicationInfo applicationInfo; Want want; - ElementName element("", "com.huawei.shell_assistant", "MainAbility"); + ElementName element("", "com.shell_assistant", "MainAbility"); want.SetElement(element); bool res = interceptor->CheckAncoShellCall(applicationInfo, want); EXPECT_FALSE(res); From aab336f17f03462830ea2fd5d21442fd7ad76f41 Mon Sep 17 00:00:00 2001 From: zyr020212 Date: Fri, 9 Jan 2026 15:16:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zyr020212 --- test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn index 32c8dd4074..33e17713aa 100644 --- a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn +++ b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn @@ -19,6 +19,7 @@ ohos_unittest("modal_system_app_freeze_uiextension_test") { defines = [ "APP_NO_RESPONSE_DIALOG=1", + "APP_NO_RESPONSE_BUNDLENAME=\"com.hmos.abnormal\"", ] include_dirs = [