From d3c7e7b62dffca8865a297ea71bf53425586c038 Mon Sep 17 00:00:00 2001 From: Denis Slynko Date: Sat, 13 Sep 2025 11:24:09 +0300 Subject: [PATCH] [ANI] Remove deprecated mangling Issue: #ICXUBT Change-Id: Iedf06ad6cf751f2849efbd8c0a0fbba2b5f83f60 Signed-off-by: Denis Slynko --- interfaces/kits/ani/backup/src/backup_session.cpp | 4 ++-- .../kits/ani/backup/src/backup_session_transfer.cpp | 4 ++-- .../kits/ani/backup/src/incr_backup_session_transfer.cpp | 4 ++-- .../kits/ani/backup/src/incremental_backup_session.cpp | 8 ++++---- interfaces/kits/ani/backup/src/restore_session.cpp | 4 ++-- .../kits/ani/backup/src/restore_session_transfer.cpp | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/interfaces/kits/ani/backup/src/backup_session.cpp b/interfaces/kits/ani/backup/src/backup_session.cpp index bd52ac811..7e55e4e23 100644 --- a/interfaces/kits/ani/backup/src/backup_session.cpp +++ b/interfaces/kits/ani/backup/src/backup_session.cpp @@ -29,7 +29,7 @@ namespace OHOS::FileManagement::Backup { using namespace LibN; namespace { -const char *RESTORE_SESSION_CLEANER_CLASS_NAME = "L@ohos/backup/transfer/backup/BackupSessionCleaner;"; +const char *RESTORE_SESSION_CLEANER_CLASS_NAME = "@ohos.backup.transfer.backup.BackupSessionCleaner"; } void BackupSession::Init(ani_env *aniEnv) @@ -44,7 +44,7 @@ void BackupSession::Init(ani_env *aniEnv) return; } std::array cleanNativeFuncs = { - ani_native_function {"clean", ":V", reinterpret_cast(BackupSessionCleaner::Clean)}, + ani_native_function {"clean", ":", reinterpret_cast(BackupSessionCleaner::Clean)}, }; auto status = aniEnv->Class_BindNativeMethods(clsCleaner, cleanNativeFuncs.data(), cleanNativeFuncs.size()); if (status != ANI_OK) { diff --git a/interfaces/kits/ani/backup/src/backup_session_transfer.cpp b/interfaces/kits/ani/backup/src/backup_session_transfer.cpp index f05ae10de..3698a62d7 100644 --- a/interfaces/kits/ani/backup/src/backup_session_transfer.cpp +++ b/interfaces/kits/ani/backup/src/backup_session_transfer.cpp @@ -32,8 +32,8 @@ namespace OHOS::FileManagement::Backup { namespace { -const char *BACKUP_SESSION_TRANSFER_CLASS_NAME = "L@ohos/backup/transfer/backup/BackupSessionTransfer;"; -const char *BACKUP_SESSION_CLASS_NAME = "L@ohos/backup/transfer/backup/BackupSession;"; +const char *BACKUP_SESSION_TRANSFER_CLASS_NAME = "@ohos.backup.transfer.backup.BackupSessionTransfer"; +const char *BACKUP_SESSION_CLASS_NAME = "@ohos.backup.transfer.backup.BackupSession"; } void BackupSessionTransfer::Init(ani_env *aniEnv) diff --git a/interfaces/kits/ani/backup/src/incr_backup_session_transfer.cpp b/interfaces/kits/ani/backup/src/incr_backup_session_transfer.cpp index 5b55e724a..055e032ff 100644 --- a/interfaces/kits/ani/backup/src/incr_backup_session_transfer.cpp +++ b/interfaces/kits/ani/backup/src/incr_backup_session_transfer.cpp @@ -31,8 +31,8 @@ namespace OHOS::FileManagement::Backup { namespace { -const char *BACKUP_SESSION_TRANSFER_CLASS_NAME = "L@ohos/backup/transfer/backup/IncrBackupSessionTransfer;"; -const char *INCR_BACKUP_SESSION_CLASS_NAME = "L@ohos/backup/transfer/backup/IncrementalBackupSession;"; +const char *BACKUP_SESSION_TRANSFER_CLASS_NAME = "@ohos.backup.transfer.backup.IncrBackupSessionTransfer"; +const char *INCR_BACKUP_SESSION_CLASS_NAME = "@ohos.backup.transfer.backup.IncrementalBackupSession"; } void IncreBackupSessionTransfer::Init(ani_env *aniEnv) diff --git a/interfaces/kits/ani/backup/src/incremental_backup_session.cpp b/interfaces/kits/ani/backup/src/incremental_backup_session.cpp index eae27f285..2a41301b6 100644 --- a/interfaces/kits/ani/backup/src/incremental_backup_session.cpp +++ b/interfaces/kits/ani/backup/src/incremental_backup_session.cpp @@ -29,9 +29,9 @@ namespace OHOS::FileManagement::Backup { using namespace LibN; namespace { -const char *BACKUP_SESSION_CLASS_NAME = "L@ohos/backup/transfer/backup/IncrementalBackupSession;"; -const char *B_INCREMENTAL_DATA_CLASS_NAME = "L@ohos/backup/transfer/backup/BIncrementalData;"; -const char *INCR_BACKUP_SESSION_CLEANER_CLASS_NAME = "L@ohos/backup/transfer/backup/IncrBackupSessionCleaner;"; +const char *BACKUP_SESSION_CLASS_NAME = "@ohos.backup.transfer.backup/IncrementalBackupSession;"; +const char *B_INCREMENTAL_DATA_CLASS_NAME = "@ohos.backup.transfer.backup.BIncrementalData"; +const char *INCR_BACKUP_SESSION_CLEANER_CLASS_NAME = "@ohos.backup.transfer.backup.IncrBackupSessionCleaner"; constexpr int32_t E_OK = 0; } @@ -48,7 +48,7 @@ void IncrementalBackupSession::Init(ani_env *aniEnv) return; } std::array cleanNativeFuncs = { - ani_native_function {"clean", ":V", reinterpret_cast(IncrBackupSessionCleaner::Clean)}, + ani_native_function {"clean", ":", reinterpret_cast(IncrBackupSessionCleaner::Clean)}, }; auto status = aniEnv->Class_BindNativeMethods(clsCleaner, cleanNativeFuncs.data(), cleanNativeFuncs.size()); if (status != ANI_OK) { diff --git a/interfaces/kits/ani/backup/src/restore_session.cpp b/interfaces/kits/ani/backup/src/restore_session.cpp index 239f48633..38ded61ef 100644 --- a/interfaces/kits/ani/backup/src/restore_session.cpp +++ b/interfaces/kits/ani/backup/src/restore_session.cpp @@ -29,7 +29,7 @@ namespace OHOS::FileManagement::Backup { using namespace LibN; namespace { -const char *RESTORE_SESSION_CLEANER_CLASS_NAME = "L@ohos/backup/transfer/backup/RestoreSessionCleaner;"; +const char *RESTORE_SESSION_CLEANER_CLASS_NAME = "@ohos.backup.transfer.backup.RestoreSessionCleaner"; } void RestoreSession::Init(ani_env *aniEnv) @@ -44,7 +44,7 @@ void RestoreSession::Init(ani_env *aniEnv) return; } std::array cleanNativeFuncs = { - ani_native_function {"clean", ":V", reinterpret_cast(RestoreSessionCleaner::Clean)}, + ani_native_function {"clean", ":", reinterpret_cast(RestoreSessionCleaner::Clean)}, }; auto status = aniEnv->Class_BindNativeMethods(clsCleaner, cleanNativeFuncs.data(), cleanNativeFuncs.size()); if (status != ANI_OK) { diff --git a/interfaces/kits/ani/backup/src/restore_session_transfer.cpp b/interfaces/kits/ani/backup/src/restore_session_transfer.cpp index ea07875fb..5b2e40014 100644 --- a/interfaces/kits/ani/backup/src/restore_session_transfer.cpp +++ b/interfaces/kits/ani/backup/src/restore_session_transfer.cpp @@ -32,8 +32,8 @@ namespace OHOS::FileManagement::Backup { namespace { -const char *RESTORE_SESSION_TRANSFER_CLASS_NAME = "L@ohos/backup/transfer/backup/RestoreSessionTransfer;"; -const char *RESTORE_SESSION_CLASS_NAME = "L@ohos/backup/transfer/backup/RestoreSession;"; +const char *RESTORE_SESSION_TRANSFER_CLASS_NAME = "@ohos.backup.transfer.backup.RestoreSessionTransfer"; +const char *RESTORE_SESSION_CLASS_NAME = "@ohos.backup.transfer.backup.RestoreSession"; } void RestoreSessionTransfer::Init(ani_env *aniEnv) -- Gitee