From 72d3c6e789becce2ee46d351220e5fed3e0bbbb9 Mon Sep 17 00:00:00 2001
From: anqi <anqi20@huawei.com>
Date: Wed, 24 May 2023 08:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81audio=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E9=81=97=E7=95=99=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=20Signed-off-by:=20anqi=20<anqi20@huawei.com?=
 =?UTF-8?q?>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BUILD.gn                                      |   8 +-
 bundle.json                                   |   1 +
 framework/common/same_process_ipc_guard.h     |   3 +-
 framework/common/tlv_object.h                 |  10 +-
 framework/common/tlv_util.h                   |  64 ++++++
 framework/common/udmf_types_util.cpp          |  35 +++
 framework/common/udmf_types_util.h            |   5 +
 .../innerkitsimpl/common/unified_key.cpp      |   2 -
 .../data/application_defined_record.cpp       |   2 -
 framework/innerkitsimpl/data/audio.cpp        |  29 +++
 framework/innerkitsimpl/data/unified_data.cpp |   6 +-
 .../test/fuzztest/udmfclient_fuzzer/BUILD.gn  | 151 ++++++-------
 .../udmfclient_fuzzer/udmf_client_fuzzer.h    |   2 +-
 .../innerkitsimpl/test/unittest/BUILD.gn      |  14 +-
 .../test/unittest/udmf_client_test.cpp        | 213 ++++++++++--------
 .../data/application_defined_record_napi.cpp  |  11 +-
 framework/jskitsimpl/data/audio_napi.cpp      |  71 ++++++
 framework/jskitsimpl/data/file_napi.cpp       |   3 +-
 framework/jskitsimpl/data/folder_napi.cpp     |   3 +-
 framework/jskitsimpl/data/html_napi.cpp       |   3 +-
 framework/jskitsimpl/data/image_napi.cpp      |   3 +-
 framework/jskitsimpl/data/link_napi.cpp       |   3 +-
 framework/jskitsimpl/data/plain_text_napi.cpp |   5 +-
 framework/jskitsimpl/data/summary_napi.cpp    |   1 -
 .../data/system_defined_appitem_napi.cpp      |   5 +-
 .../data/system_defined_form_napi.cpp         |   5 +-
 .../data/system_defined_pixelmap_napi.cpp     |   1 -
 .../data/system_defined_record_napi.cpp       |   1 -
 framework/jskitsimpl/data/text_napi.cpp       |   1 -
 framework/jskitsimpl/data/udmf_napi.cpp       |   4 -
 .../jskitsimpl/data/unified_data_napi.cpp     |  38 +++-
 .../jskitsimpl/data/unified_record_napi.cpp   |   2 -
 framework/jskitsimpl/data/video_napi.cpp      |   5 +-
 framework/manager/data_manager.cpp            |   3 +-
 framework/manager/data_manager.h              |   2 +-
 framework/manager/lifecycle/clean_after_get.h |   2 +-
 .../manager/lifecycle/clean_on_startup.h      |   2 +-
 .../manager/lifecycle/clean_on_timeout.h      |   3 +-
 .../manager/lifecycle/lifecycle_manager.h     |   2 +-
 .../manager/lifecycle/lifecycle_policy.h      |   2 +-
 .../manager/preprocess/preprocess_utils.cpp   |   2 +-
 .../manager/preprocess/preprocess_utils.h     |   2 +-
 framework/manager/store/runtime_store.h       |   2 +-
 framework/manager/store/store.h               |   2 +-
 framework/manager/store/store_cache.h         |   2 +-
 framework/service/udmf_service.h              |   4 +
 framework/service/udmf_service_proxy.cpp      |  20 +-
 interfaces/innerkits/BUILD.gn                 |  19 +-
 interfaces/innerkits/common/error_code.h      |   2 +-
 interfaces/innerkits/common/unified_meta.h    |   3 +-
 interfaces/innerkits/common/unified_types.h   |  20 +-
 interfaces/innerkits/data/audio.h             |  31 +++
 interfaces/innerkits/data/html.h              |   2 +-
 interfaces/innerkits/data/image.h             |   2 +-
 interfaces/innerkits/data/link.h              |   2 +-
 interfaces/innerkits/data/plain_text.h        |   2 +-
 .../innerkits/data/system_defined_appitem.h   |   2 +-
 .../innerkits/data/system_defined_form.h      |   2 +-
 .../innerkits/data/system_defined_pixelmap.h  |   2 +-
 .../innerkits/data/system_defined_record.h    |   2 +-
 interfaces/innerkits/data/text.h              |   2 +-
 interfaces/innerkits/data/unified_data.h      |   4 +-
 interfaces/innerkits/data/unified_record.h    |   3 +-
 interfaces/innerkits/data/video.h             |   2 +-
 interfaces/jskits/BUILD.gn                    |  42 ++--
 interfaces/jskits/common/napi_error_utils.h   |   1 -
 interfaces/jskits/common/napi_queue.h         |   2 +-
 interfaces/jskits/data/audio_napi.h           |  41 ++++
 interfaces/jskits/data/html_napi.h            |   2 +-
 interfaces/jskits/data/image_napi.h           |   2 +-
 interfaces/jskits/data/link_napi.h            |   2 +-
 interfaces/jskits/data/plain_text_napi.h      |   2 +-
 interfaces/jskits/data/summary_napi.h         |   2 +-
 .../jskits/data/system_defined_appitem_napi.h |   2 +-
 .../jskits/data/system_defined_form_napi.h    |   2 +-
 .../data/system_defined_pixelmap_napi.h       |   2 +-
 .../jskits/data/system_defined_record_napi.h  |   2 +-
 interfaces/jskits/data/text_napi.h            |   2 +-
 interfaces/jskits/data/udmf_napi.h            |   2 +-
 interfaces/jskits/data/unified_data_napi.h    |   2 +-
 interfaces/jskits/data/unified_record_napi.h  |   2 +-
 interfaces/jskits/data/video_napi.h           |   2 +-
 interfaces/jskits/module/udmf_napi_module.cpp |   5 +-
 service/BUILD.gn                              |  12 +-
 service/src/udmf_service_impl.cpp             |   2 -
 service/src/udmf_service_stub.cpp             |  21 +-
 udmf.gni                                      |  21 +-
 87 files changed, 681 insertions(+), 356 deletions(-)
 create mode 100644 framework/innerkitsimpl/data/audio.cpp
 create mode 100644 framework/jskitsimpl/data/audio_napi.cpp
 create mode 100644 interfaces/innerkits/data/audio.h
 create mode 100644 interfaces/jskits/data/audio_napi.h

diff --git a/BUILD.gn b/BUILD.gn
index 24f06bb..0cf8476 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -17,8 +17,8 @@ group("udmf_packages") {
   if (is_standard_system) {
     deps = [
       "interfaces/innerkits:udmf_client",
-      "interfaces/jskits:udmf_napi",
       "interfaces/jskits:udmf_data_napi",
+      "interfaces/jskits:udmf_napi",
       "service:udmf_server",
     ]
   }
@@ -27,7 +27,5 @@ group("udmf_packages") {
 group("fuzztest") {
   testonly = true
   deps = []
-  deps += [
-    "framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer:fuzztest",
-  ]
-}
\ No newline at end of file
+  deps += [ "framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer:fuzztest" ]
+}
diff --git a/bundle.json b/bundle.json
index 76fc3c4..924774a 100644
--- a/bundle.json
+++ b/bundle.json
@@ -78,6 +78,7 @@
           "header": {
             "header_files": [
               "application_defined_record.h",
+              "audio.h",
               "file.h",
               "folder.h",
               "html.h",
diff --git a/framework/common/same_process_ipc_guard.h b/framework/common/same_process_ipc_guard.h
index eb2c32c..02ecb47 100644
--- a/framework/common/same_process_ipc_guard.h
+++ b/framework/common/same_process_ipc_guard.h
@@ -37,8 +37,7 @@ public:
 private:
     std::string identity;
 };
-
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_SAMEPROCESSIPCGUARD_H
\ No newline at end of file
+#endif // UDMF_SAMEPROCESSIPCGUARD_H
\ No newline at end of file
diff --git a/framework/common/tlv_object.h b/framework/common/tlv_object.h
index 6d42d34..80f2b71 100755
--- a/framework/common/tlv_object.h
+++ b/framework/common/tlv_object.h
@@ -179,7 +179,7 @@ public:
     template<typename T>
     bool ReadBasic(T &value)
     {
-        TLVHead head{};
+        TLVHead head {};
         if (!ReadHead(head)) {
             return false;
         }
@@ -218,7 +218,7 @@ public:
 
     bool ReadString(std::string &value)
     {
-        TLVHead head{};
+        TLVHead head {};
         if (!ReadHead(head)) {
             return false;
         }
@@ -250,7 +250,7 @@ public:
 
     bool ReadVector(std::vector<uint8_t> &value)
     {
-        TLVHead head{};
+        TLVHead head {};
         if (!ReadHead(head)) {
             return false;
         }
@@ -320,7 +320,7 @@ public:
 
     bool ReadVariant(UDVariant &value)
     {
-        TLVHead head{};
+        TLVHead head {};
         if (!ReadHead(head)) {
             return false;
         }
@@ -408,7 +408,7 @@ public:
 
     bool ReadMap(UDDetails &value)
     {
-        TLVHead head{};
+        TLVHead head {};
         if (!ReadHead(head)) {
             return false;
         }
diff --git a/framework/common/tlv_util.h b/framework/common/tlv_util.h
index 1f90001..e256c86 100755
--- a/framework/common/tlv_util.h
+++ b/framework/common/tlv_util.h
@@ -19,6 +19,7 @@
 #include <type_traits>
 
 #include "application_defined_record.h"
+#include "audio.h"
 #include "file.h"
 #include "folder.h"
 #include "html.h"
@@ -140,6 +141,20 @@ bool CountBufferSize(const std::shared_ptr<UnifiedRecord> &input, TLVObject &dat
             data.Count(file->GetDetails());
             break;
         }
+        case UDType::AUDIO: {
+            auto audio = static_cast<Audio *>(input.get());
+            if (audio == nullptr) {
+                return false;
+            }
+            data.Count(audio->GetUri());
+            data.Count(audio->GetRemoteUri());
+            auto file = static_cast<File *>(input.get());
+            if (file == nullptr) {
+                return false;
+            }
+            data.Count(file->GetDetails());
+            break;
+        }
         case UDType::FOLDER: {
             auto folder = static_cast<Folder *>(input.get());
             if (folder == nullptr) {
@@ -563,6 +578,33 @@ bool Reading(Video &output, TLVObject &data)
     return true;
 }
 
+template<>
+bool Writing(const Audio &input, TLVObject &data)
+{
+    return true;
+}
+
+template<>
+bool Reading(Audio &output, TLVObject &data)
+{
+    std::string uri;
+    std::string remoteUri;
+    UDDetails details;
+    if (!Reading(uri, data)) {
+        return false;
+    }
+    if (!Reading(remoteUri, data)) {
+        return false;
+    }
+    if (!Reading(details, data)) {
+        return false;
+    }
+    output.SetUri(uri);
+    output.SetRemoteUri(remoteUri);
+    output.SetDetails(details);
+    return true;
+}
+
 template<>
 bool Writing(const Folder &input, TLVObject &data)
 {
@@ -885,6 +927,20 @@ bool Writing(const std::shared_ptr<UnifiedRecord> &input, TLVObject &data)
             }
             return Writing(*file, data);
         }
+        case UDType::AUDIO: {
+            auto audio = static_cast<Audio *>(input.get());
+            if (audio == nullptr) {
+                return false;
+            }
+            if (!Writing(*audio, data)) {
+                return false;
+            }
+            auto file = static_cast<File *>(input.get());
+            if (file == nullptr) {
+                return false;
+            }
+            return Writing(*file, data);
+        }
         case UDType::FOLDER: {
             auto folder = static_cast<Folder *>(input.get());
             if (folder == nullptr) {
@@ -1029,6 +1085,14 @@ bool Reading(std::shared_ptr<UnifiedRecord> &output, TLVObject &data)
             output = video;
             break;
         }
+        case UDType::AUDIO: {
+            std::shared_ptr<Audio> audio = std::make_shared<Audio>();
+            if (!Reading(*audio, data)) {
+                return false;
+            }
+            output = audio;
+            break;
+        }
         case UDType::FOLDER: {
             std::shared_ptr<Folder> folder = std::make_shared<Folder>();
             if (!Reading(*folder, data)) {
diff --git a/framework/common/udmf_types_util.cpp b/framework/common/udmf_types_util.cpp
index 75a4b34..bd5d6fe 100755
--- a/framework/common/udmf_types_util.cpp
+++ b/framework/common/udmf_types_util.cpp
@@ -85,6 +85,13 @@ template<> bool Marshalling(const std::shared_ptr<UnifiedRecord> &input, Message
             }
             return ITypesUtil::Marshal(parcel, *video);
         }
+        case AUDIO: {
+            auto audio = static_cast<Audio *>(input.get());
+            if (audio == nullptr) {
+                return false;
+            }
+            return ITypesUtil::Marshal(parcel, *audio);
+        }
         case SYSTEM_DEFINED_RECORD: {
             auto sdRecord = static_cast<SystemDefinedRecord *>(input.get());
             if (sdRecord == nullptr) {
@@ -198,6 +205,14 @@ template<> bool Unmarshalling(std::shared_ptr<UnifiedRecord> &output, MessagePar
             output = video;
             break;
         }
+        case AUDIO: {
+            std::shared_ptr<Audio> audio = std::make_shared<Audio>();
+            if (!ITypesUtil::Unmarshal(parcel, *audio)) {
+                return false;
+            }
+            output = audio;
+            break;
+        }
         case SYSTEM_DEFINED_RECORD: {
             std::shared_ptr<SystemDefinedRecord> sdRecord = std::make_shared<SystemDefinedRecord>();
             if (!ITypesUtil::Unmarshal(parcel, *sdRecord)) {
@@ -438,6 +453,26 @@ template<> bool Unmarshalling(Video &output, MessageParcel &parcel)
     return true;
 }
 
+template<> bool Marshalling(const Audio &input, MessageParcel &parcel)
+{
+    return ITypesUtil::Marshal(parcel, input.GetUri(), input.GetRemoteUri(), input.GetDetails());
+}
+
+template<> bool Unmarshalling(Audio &output, MessageParcel &parcel)
+{
+    std::string uri;
+    std::string remoteUri;
+    UDDetails details;
+    if (!ITypesUtil::Unmarshal(parcel, uri, remoteUri, details)) {
+        LOG_ERROR(UDMF_FRAMEWORK, "Unmarshal Audio failed!");
+        return false;
+    }
+    output.SetUri(uri);
+    output.SetRemoteUri(remoteUri);
+    output.SetDetails(details);
+    return true;
+}
+
 template<> bool Marshalling(const Folder &input, MessageParcel &parcel)
 {
     return ITypesUtil::Marshal(parcel, input.GetUri(), input.GetRemoteUri(), input.GetDetails());
diff --git a/framework/common/udmf_types_util.h b/framework/common/udmf_types_util.h
index bfaa743..b631f80 100644
--- a/framework/common/udmf_types_util.h
+++ b/framework/common/udmf_types_util.h
@@ -19,6 +19,7 @@
 #include "itypes_util.h"
 
 #include "application_defined_record.h"
+#include "audio.h"
 #include "file.h"
 #include "folder.h"
 #include "html.h"
@@ -52,6 +53,7 @@ using File = UDMF::File;
 using Folder = UDMF::Folder;
 using Image = UDMF::Image;
 using Video = UDMF::Video;
+using Audio = UDMF::Audio;
 using SystemDefinedRecord = UDMF::SystemDefinedRecord;
 using SystemDefinedForm = UDMF::SystemDefinedForm;
 using SystemDefinedAppItem = UDMF::SystemDefinedAppItem;
@@ -99,6 +101,9 @@ template<> bool Unmarshalling(Image &output, MessageParcel &parcel);
 template<> bool Marshalling(const Video &input, MessageParcel &parcel);
 template<> bool Unmarshalling(Video &output, MessageParcel &parcel);
 
+template<> bool Marshalling(const Audio &input, MessageParcel &parcel);
+template<> bool Unmarshalling(Audio &output, MessageParcel &parcel);
+
 template<> bool Marshalling(const Folder &input, MessageParcel &parcel);
 template<> bool Unmarshalling(Folder &output, MessageParcel &parcel);
 
diff --git a/framework/innerkitsimpl/common/unified_key.cpp b/framework/innerkitsimpl/common/unified_key.cpp
index a991438..ac4e94a 100644
--- a/framework/innerkitsimpl/common/unified_key.cpp
+++ b/framework/innerkitsimpl/common/unified_key.cpp
@@ -15,8 +15,6 @@
 
 #include "unified_key.h"
 
-#include <utility>
-
 #include "logger.h"
 
 namespace OHOS {
diff --git a/framework/innerkitsimpl/data/application_defined_record.cpp b/framework/innerkitsimpl/data/application_defined_record.cpp
index 82ad4db..cc6c8c0 100644
--- a/framework/innerkitsimpl/data/application_defined_record.cpp
+++ b/framework/innerkitsimpl/data/application_defined_record.cpp
@@ -15,8 +15,6 @@
 
 #include "application_defined_record.h"
 
-#include <utility>
-
 namespace OHOS {
 namespace UDMF {
 ApplicationDefinedRecord::ApplicationDefinedRecord() : UnifiedRecord(APPLICATION_DEFINED_RECORD)
diff --git a/framework/innerkitsimpl/data/audio.cpp b/framework/innerkitsimpl/data/audio.cpp
new file mode 100644
index 0000000..9f6a1ba
--- /dev/null
+++ b/framework/innerkitsimpl/data/audio.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "audio.h"
+
+namespace OHOS {
+namespace UDMF {
+Audio::Audio() : Audio("")
+{
+}
+
+Audio::Audio(const std::string &uri) : File(uri)
+{
+    this->dataType_ = AUDIO;
+}
+} // namespace UDMF
+} // namespace OHOS
\ No newline at end of file
diff --git a/framework/innerkitsimpl/data/unified_data.cpp b/framework/innerkitsimpl/data/unified_data.cpp
index 417c515..7062a7e 100755
--- a/framework/innerkitsimpl/data/unified_data.cpp
+++ b/framework/innerkitsimpl/data/unified_data.cpp
@@ -46,11 +46,7 @@ void UnifiedData::AddRecord(const std::shared_ptr<UnifiedRecord> &record)
     if (record == nullptr) {
         return;
     }
-    this->records_.emplace_back(record);
-    if (records_.size() > MAX_RECORD_NUM) {
-        std::vector<std::shared_ptr<UnifiedRecord>> new_records(records_.begin(), records_.end() - 1);
-        this->records_ = new_records;
-    }
+    this->records_.push_back(record);
 }
 
 std::shared_ptr<UnifiedRecord> UnifiedData::GetRecordAt(std::size_t index)
diff --git a/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn b/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn
index d29af8c..a2b220f 100644
--- a/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn
+++ b/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn
@@ -1,76 +1,75 @@
-# Copyright (c) 2023 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#####################hydra-fuzz###################
-import("//build/test.gni")
-import("//build/config/features.gni")
-import("//foundation/distributeddatamgr/udmf/udmf.gni")
-
-##############################fuzztest##########################################
-ohos_fuzztest("UdmfClientFuzzTest") {
-  module_out_path = "udmf/innerkitsImpl"
-
-  include_dirs = [
-    "${udmf_interfaces_path}/innerkits/client",
-    "${udmf_interfaces_path}/innerkits/common",
-    "${udmf_interfaces_path}/innerkits/data",
-    "${udmf_framework_path}/common",
-    "${udmf_framework_path}/manager",
-    "${udmf_framework_path}/manager/container",
-    "${udmf_framework_path}/manager/store",
-    "${udmf_framework_path}/manager/preprocess",
-    "${udmf_framework_path}/service",
-  ]
-
-  fuzz_config_file = "${udmf_framework_path}/innerkitsimpl/test/fuzztest/udmfclient_fuzzer"
-
-  cflags = [
-    "-g",
-    "-O0",
-    "-Wno-unused-variable",
-    "-fno-omit-frame-pointer",
-  ]
-
-  sources = [
-  "udmf_client_fuzzer.cpp",
-  ]
-
-  deps = [
-    "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_client",
-    "//foundation/distributeddatamgr/udmf/service:udmf_server",
-  ]
-
-  external_deps = [
-  "access_token:libaccesstoken_sdk",
-  "access_token:libnativetoken",
-  "access_token:libtoken_setproc",
-  "bundle_framework:appexecfwk_core",
-  "c_utils:utils",
-  "hiviewdfx_hilog_native:libhilog",
-  "ipc:ipc_core",
-  "kv_store:distributeddata_inner",
-  "os_account:os_account_innerkits",
-  "samgr:samgr_proxy",
-  ]
-}
-
-###############################################################################
-group("fuzztest") {
-  testonly = true
-  deps = []
-  deps += [
-    # deps file
-    ":UdmfClientFuzzTest",
-  ]
-}
-###############################################################################
+# Copyright (c) 2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/config/features.gni")
+
+#####################hydra-fuzz###################
+import("//build/test.gni")
+import("//foundation/distributeddatamgr/udmf/udmf.gni")
+
+##############################fuzztest##########################################
+ohos_fuzztest("UdmfClientFuzzTest") {
+  module_out_path = "udmf/innerkitsImpl"
+
+  include_dirs = [
+    "${udmf_interfaces_path}/innerkits/client",
+    "${udmf_interfaces_path}/innerkits/common",
+    "${udmf_interfaces_path}/innerkits/data",
+    "${udmf_framework_path}/common",
+    "${udmf_framework_path}/manager",
+    "${udmf_framework_path}/manager/container",
+    "${udmf_framework_path}/manager/store",
+    "${udmf_framework_path}/manager/preprocess",
+    "${udmf_framework_path}/service",
+  ]
+
+  fuzz_config_file =
+      "${udmf_framework_path}/innerkitsimpl/test/fuzztest/udmfclient_fuzzer"
+
+  cflags = [
+    "-g",
+    "-O0",
+    "-Wno-unused-variable",
+    "-fno-omit-frame-pointer",
+  ]
+
+  sources = [ "udmf_client_fuzzer.cpp" ]
+
+  deps = [
+    "../../../../../interfaces/innerkits:udmf_client",
+    "../../../../../service:udmf_server",
+  ]
+
+  external_deps = [
+    "access_token:libaccesstoken_sdk",
+    "access_token:libnativetoken",
+    "access_token:libtoken_setproc",
+    "bundle_framework:appexecfwk_core",
+    "c_utils:utils",
+    "hiviewdfx_hilog_native:libhilog",
+    "ipc:ipc_core",
+    "kv_store:distributeddata_inner",
+    "os_account:os_account_innerkits",
+    "samgr:samgr_proxy",
+  ]
+}
+
+###############################################################################
+group("fuzztest") {
+  testonly = true
+  deps = []
+  deps += [
+    # deps file
+    ":UdmfClientFuzzTest",
+  ]
+}
+###############################################################################
diff --git a/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/udmf_client_fuzzer.h b/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/udmf_client_fuzzer.h
index f9dfd79..e59a5f9 100644
--- a/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/udmf_client_fuzzer.h
+++ b/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/udmf_client_fuzzer.h
@@ -18,4 +18,4 @@
 
 #define FUZZ_PROJECT_NAME "udmfclient_fuzzer"
 
-#endif //UDMF_UDMF_CLIENT_FUZZER_H
+#endif // UDMF_UDMF_CLIENT_FUZZER_H
diff --git a/framework/innerkitsimpl/test/unittest/BUILD.gn b/framework/innerkitsimpl/test/unittest/BUILD.gn
index 839e172..958a03f 100755
--- a/framework/innerkitsimpl/test/unittest/BUILD.gn
+++ b/framework/innerkitsimpl/test/unittest/BUILD.gn
@@ -32,10 +32,10 @@ config("module_private_config") {
 }
 
 common_deps = [
-  "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_client",
-  "//foundation/distributeddatamgr/udmf/service:udmf_server",
-  "//foundation/ability/ability_runtime/interfaces/inner_api/uri_permission:uri_permission_mgr",
-  "//third_party/googletest:gtest_main",
+  "${aafwk_path}/interfaces/inner_api/uri_permission:uri_permission_mgr",
+  "${third_party_path}/googletest:gtest_main",
+  "../../../../interfaces/innerkits:udmf_client",
+  "../../../../service:udmf_server",
 ]
 
 common_external_deps = [
@@ -67,8 +67,6 @@ ohos_unittest("UdmfClientTest") {
 group("unittest") {
   testonly = true
 
-  deps = [
-    ":UdmfClientTest",
-  ]
+  deps = [ ":UdmfClientTest" ]
 }
-###############################################################################
\ No newline at end of file
+###############################################################################
diff --git a/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp b/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp
index 094f1e5..71c6d3b 100755
--- a/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp
+++ b/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp
@@ -13,28 +13,28 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
+#include "udmf_client.h"
 
+#include <gtest/gtest.h>
 #include <unistd.h>
 
-#include "token_setproc.h"
 #include "accesstoken_kit.h"
-#include "nativetoken_kit.h"
-
-#include "logger.h"
-#include "udmf_client.h"
 #include "application_defined_record.h"
+#include "audio.h"
 #include "file.h"
 #include "folder.h"
 #include "html.h"
 #include "image.h"
 #include "link.h"
+#include "logger.h"
+#include "nativetoken_kit.h"
 #include "plain_text.h"
 #include "system_defined_appitem.h"
 #include "system_defined_form.h"
 #include "system_defined_pixelmap.h"
 #include "system_defined_record.h"
 #include "text.h"
+#include "token_setproc.h"
 #include "video.h"
 
 using namespace testing::ext;
@@ -89,37 +89,24 @@ void UdmfClientTest::SetNativeToken()
 void UdmfClientTest::SetHapToken1()
 {
     HapInfoParams info = {
-        .userID = USER_ID,
-        .bundleName = "ohos.test.demo1",
-        .instIndex = INST_INDEX,
-        .appIDDesc = "ohos.test.demo1"
+        .userID = USER_ID, .bundleName = "ohos.test.demo1", .instIndex = INST_INDEX, .appIDDesc = "ohos.test.demo1"
     };
 
-    HapPolicyParams policy = {
-        .apl = APL_NORMAL,
+    HapPolicyParams policy = { .apl = APL_NORMAL,
         .domain = "test.domain",
-        .permList = {
-            {
-                .permissionName = "ohos.permission.test",
-                .bundleName = "ohos.test.demo1",
-                .grantMode = 1,
-                .availableLevel = APL_NORMAL,
-                .label = "label",
-                .labelId = 1,
-                .description = "test1",
-                .descriptionId = 1
-            }
-        },
-        .permStateList = {
-            {
-                .permissionName = "ohos.permission.test",
-                .isGeneral = true,
-                .resDeviceID = { "local" },
-                .grantStatus = { PermissionState::PERMISSION_GRANTED },
-                .grantFlags = { 1 }
-            }
-        }
-    };
+        .permList = { { .permissionName = "ohos.permission.test",
+            .bundleName = "ohos.test.demo1",
+            .grantMode = 1,
+            .availableLevel = APL_NORMAL,
+            .label = "label",
+            .labelId = 1,
+            .description = "test1",
+            .descriptionId = 1 } },
+        .permStateList = { { .permissionName = "ohos.permission.test",
+            .isGeneral = true,
+            .resDeviceID = { "local" },
+            .grantStatus = { PermissionState::PERMISSION_GRANTED },
+            .grantFlags = { 1 } } } };
     auto tokenID = AccessTokenKit::AllocHapToken(info, policy);
     SetSelfTokenID(tokenID.tokenIDEx);
 }
@@ -127,37 +114,24 @@ void UdmfClientTest::SetHapToken1()
 void UdmfClientTest::SetHapToken2()
 {
     HapInfoParams info = {
-        .userID = USER_ID,
-        .bundleName = "ohos.test.demo2",
-        .instIndex = INST_INDEX,
-        .appIDDesc = "ohos.test.demo2"
+        .userID = USER_ID, .bundleName = "ohos.test.demo2", .instIndex = INST_INDEX, .appIDDesc = "ohos.test.demo2"
     };
 
-    HapPolicyParams policy = {
-        .apl = APL_NORMAL,
+    HapPolicyParams policy = { .apl = APL_NORMAL,
         .domain = "test.domain",
-        .permList = {
-            {
-                .permissionName = "ohos.permission.test",
-                .bundleName = "ohos.test.demo2",
-                .grantMode = 1,
-                .availableLevel = APL_NORMAL,
-                .label = "label",
-                .labelId = 1,
-                .description = "test2",
-                .descriptionId = 1
-            }
-        },
-        .permStateList = {
-            {
-                .permissionName = "ohos.permission.test",
-                .isGeneral = true,
-                .resDeviceID = { "local" },
-                .grantStatus = { PermissionState::PERMISSION_GRANTED },
-                .grantFlags = { 1 }
-            }
-        }
-    };
+        .permList = { { .permissionName = "ohos.permission.test",
+            .bundleName = "ohos.test.demo2",
+            .grantMode = 1,
+            .availableLevel = APL_NORMAL,
+            .label = "label",
+            .labelId = 1,
+            .description = "test2",
+            .descriptionId = 1 } },
+        .permStateList = { { .permissionName = "ohos.permission.test",
+            .isGeneral = true,
+            .resDeviceID = { "local" },
+            .grantStatus = { PermissionState::PERMISSION_GRANTED },
+            .grantFlags = { 1 } } } };
     auto tokenID = AccessTokenKit::AllocHapToken(info, policy);
     SetSelfTokenID(tokenID.tokenIDEx);
 }
@@ -553,13 +527,60 @@ HWTEST_F(UdmfClientTest, SetData008, TestSize.Level1)
 
 /**
 * @tc.name: SetData009
-* @tc.desc: Set Folder record with valid params and get data
+* @tc.desc: Set Audio record with valid params and get data
 * @tc.type: FUNC
 */
 HWTEST_F(UdmfClientTest, SetData009, TestSize.Level1)
 {
     LOG_INFO(UDMF_TEST, "SetData009 begin.");
 
+    CustomOption option1 = { .intention = Intention::UD_INTENTION_DRAG };
+    UnifiedData data1;
+    std::string key;
+    Audio audio1;
+    UDDetails details1;
+    details1.insert({ "udmf_key", "udmf_value" });
+    audio1.SetDetails(details1);
+    audio1.SetRemoteUri("remoteUri");
+    std::shared_ptr<UnifiedRecord> record1 = std::make_shared<Audio>(audio1);
+    data1.AddRecord(record1);
+    auto status = UdmfClient::GetInstance().SetData(option1, data1, key);
+    ASSERT_EQ(status, E_OK);
+
+    QueryOption option2 = { .key = key };
+    AddPrivilege(option2);
+    SetHapToken2();
+    UnifiedData data2;
+    status = UdmfClient::GetInstance().GetData(option2, data2);
+    ASSERT_EQ(status, E_OK);
+
+    std::shared_ptr<UnifiedRecord> record2 = data2.GetRecordAt(0);
+    ASSERT_NE(record2, nullptr);
+    auto type = record2->GetType();
+    EXPECT_EQ(type, UDType::AUDIO);
+
+    auto file2 = static_cast<File *>(record2.get());
+    ASSERT_NE(file2, nullptr);
+    CompareDetails(file2->GetDetails());
+
+    auto audio2 = static_cast<Audio *>(record2.get());
+    ASSERT_NE(audio2, nullptr);
+    EXPECT_EQ(audio1.GetRemoteUri(), audio2->GetRemoteUri());
+
+    GetEmptyData(option2);
+
+    LOG_INFO(UDMF_TEST, "SetData009 end.");
+}
+
+/**
+* @tc.name: SetData010
+* @tc.desc: Set Folder record with valid params and get data
+* @tc.type: FUNC
+*/
+HWTEST_F(UdmfClientTest, SetData010, TestSize.Level1)
+{
+    LOG_INFO(UDMF_TEST, "SetData010 begin.");
+
     CustomOption option1 = { .intention = Intention::UD_INTENTION_DRAG };
     UnifiedData data1;
     std::string key;
@@ -595,17 +616,17 @@ HWTEST_F(UdmfClientTest, SetData009, TestSize.Level1)
 
     GetEmptyData(option2);
 
-    LOG_INFO(UDMF_TEST, "SetData009 end.");
+    LOG_INFO(UDMF_TEST, "SetData010 end.");
 }
 
 /**
-* @tc.name: SetData010
+* @tc.name: SetData011
 * @tc.desc: Set SystemDefined record with valid params and get data
 * @tc.type: FUNC
 */
-HWTEST_F(UdmfClientTest, SetData010, TestSize.Level1)
+HWTEST_F(UdmfClientTest, SetData011, TestSize.Level1)
 {
-    LOG_INFO(UDMF_TEST, "SetData010 begin.");
+    LOG_INFO(UDMF_TEST, "SetData011 begin.");
 
     CustomOption option1 = { .intention = Intention::UD_INTENTION_DRAG };
     UnifiedData data1;
@@ -637,17 +658,17 @@ HWTEST_F(UdmfClientTest, SetData010, TestSize.Level1)
 
     GetEmptyData(option2);
 
-    LOG_INFO(UDMF_TEST, "SetData010 end.");
+    LOG_INFO(UDMF_TEST, "SetData011 end.");
 }
 
 /**
-* @tc.name: SetData011
+* @tc.name: SetData012
 * @tc.desc: Set Form record with valid params and get data
 * @tc.type: FUNC
 */
-HWTEST_F(UdmfClientTest, SetData011, TestSize.Level1)
+HWTEST_F(UdmfClientTest, SetData012, TestSize.Level1)
 {
-    LOG_INFO(UDMF_TEST, "SetData011 begin.");
+    LOG_INFO(UDMF_TEST, "SetData012 begin.");
 
     CustomOption option1 = { .intention = Intention::UD_INTENTION_DRAG };
     UnifiedData data1;
@@ -692,17 +713,17 @@ HWTEST_F(UdmfClientTest, SetData011, TestSize.Level1)
 
     GetEmptyData(option2);
 
-    LOG_INFO(UDMF_TEST, "SetData011 end.");
+    LOG_INFO(UDMF_TEST, "SetData012 end.");
 }
 
 /**
-* @tc.name: SetData012
+* @tc.name: SetData013
 * @tc.desc: Set AppItem record with valid params and get data
 * @tc.type: FUNC
 */
-HWTEST_F(UdmfClientTest, SetData012, TestSize.Level1)
+HWTEST_F(UdmfClientTest, SetData013, TestSize.Level1)
 {
-    LOG_INFO(UDMF_TEST, "SetData012 begin.");
+    LOG_INFO(UDMF_TEST, "SetData013 begin.");
 
     CustomOption option1 = { .intention = Intention::UD_INTENTION_DRAG };
     UnifiedData data1;
@@ -749,17 +770,17 @@ HWTEST_F(UdmfClientTest, SetData012, TestSize.Level1)
 
     GetEmptyData(option2);
 
-    LOG_INFO(UDMF_TEST, "SetData012 end.");
+    LOG_INFO(UDMF_TEST, "SetData013 end.");
 }
 
 /**
-* @tc.name: SetData013
+* @tc.name: SetData014
 * @tc.desc: Set PixelMap record with valid params and get data
 * @tc.type: FUNC
 */
-HWTEST_F(UdmfClientTest, SetData013, TestSize.Level1)
+HWTEST_F(UdmfClientTest, SetData014, TestSize.Level1)
 {
-    LOG_INFO(UDMF_TEST, "SetData013 begin.");
+    LOG_INFO(UDMF_TEST, "SetData014 begin.");
 
     CustomOption option1 = { .intention = Intention::UD_INTENTION_DRAG };
     UnifiedData data1;
@@ -768,7 +789,7 @@ HWTEST_F(UdmfClientTest, SetData013, TestSize.Level1)
     UDDetails details1;
     details1.insert({ "udmf_key", "udmf_value" });
     systemDefinedPixelMap1.SetDetails(details1);
-    std::vector<uint8_t> rawData1 ={ 1, 2, 3, 4, 5 };
+    std::vector<uint8_t> rawData1 = { 1, 2, 3, 4, 5 };
     systemDefinedPixelMap1.SetRawData(rawData1);
     std::shared_ptr<UnifiedRecord> record1 = std::make_shared<SystemDefinedPixelMap>(systemDefinedPixelMap1);
     data1.AddRecord(record1);
@@ -801,17 +822,17 @@ HWTEST_F(UdmfClientTest, SetData013, TestSize.Level1)
 
     GetEmptyData(option2);
 
-    LOG_INFO(UDMF_TEST, "SetData013 end.");
+    LOG_INFO(UDMF_TEST, "SetData014 end.");
 }
 
 /**
-* @tc.name: SetData014
+* @tc.name: SetData015
 * @tc.desc: Set Application Defined record with valid params and get data
 * @tc.type: FUNC
 */
-HWTEST_F(UdmfClientTest, SetData014, TestSize.Level1)
+HWTEST_F(UdmfClientTest, SetData015, TestSize.Level1)
 {
-    LOG_INFO(UDMF_TEST, "SetData014 begin.");
+    LOG_INFO(UDMF_TEST, "SetData015 begin.");
 
     CustomOption option1 = { .intention = Intention::UD_INTENTION_DRAG };
     UnifiedData data1;
@@ -839,8 +860,8 @@ HWTEST_F(UdmfClientTest, SetData014, TestSize.Level1)
 
     auto applicationDefinedRecord2 = static_cast<ApplicationDefinedRecord *>(record2.get());
     ASSERT_NE(applicationDefinedRecord2, nullptr);
-    EXPECT_EQ(applicationDefinedRecord1.GetApplicationDefinedType(),
-              applicationDefinedRecord2->GetApplicationDefinedType());
+    EXPECT_EQ(
+        applicationDefinedRecord1.GetApplicationDefinedType(), applicationDefinedRecord2->GetApplicationDefinedType());
     auto rawData2 = applicationDefinedRecord2->GetRawData();
     EXPECT_EQ(rawData1.size(), rawData2.size());
     for (int i = 0; i < rawData1.size(); ++i) {
@@ -849,17 +870,17 @@ HWTEST_F(UdmfClientTest, SetData014, TestSize.Level1)
 
     GetEmptyData(option2);
 
-    LOG_INFO(UDMF_TEST, "SetData014 end.");
+    LOG_INFO(UDMF_TEST, "SetData015 end.");
 }
 
 /**
-* @tc.name: SetData015
+* @tc.name: SetData016
 * @tc.desc: Set multiple record with valid params and get data
 * @tc.type: FUNC
 */
-HWTEST_F(UdmfClientTest, SetData015, TestSize.Level1)
+HWTEST_F(UdmfClientTest, SetData016, TestSize.Level1)
 {
-    LOG_INFO(UDMF_TEST, "SetData015 begin.");
+    LOG_INFO(UDMF_TEST, "SetData016 begin.");
 
     CustomOption customOption = {.intention = Intention::UD_INTENTION_DRAG};
     std::string key;
@@ -888,17 +909,17 @@ HWTEST_F(UdmfClientTest, SetData015, TestSize.Level1)
         ASSERT_EQ(outputRecords[i]->GetType(), inputRecords[i]->GetType());
     }
 
-    LOG_INFO(UDMF_TEST, "SetData015 end.");
+    LOG_INFO(UDMF_TEST, "SetData016 end.");
 }
 
 /**
-* @tc.name: SetData016
+* @tc.name: SetData017
 * @tc.desc: Set 512 records with valid params and get data
 * @tc.type: FUNC
 */
-HWTEST_F(UdmfClientTest, SetData016, TestSize.Level1)
+HWTEST_F(UdmfClientTest, SetData017, TestSize.Level1)
 {
-    LOG_INFO(UDMF_TEST, "SetData016 begin.");
+    LOG_INFO(UDMF_TEST, "SetData017 begin.");
 
     CustomOption customOption = {.intention = Intention::UD_INTENTION_DRAG};
     std::string key;
@@ -919,7 +940,7 @@ HWTEST_F(UdmfClientTest, SetData016, TestSize.Level1)
     auto outputRecords = outputData.GetRecords();
     ASSERT_EQ(inputRecords.size(), outputRecords.size());
 
-    LOG_INFO(UDMF_TEST, "SetData016 end.");
+    LOG_INFO(UDMF_TEST, "SetData017 end.");
 }
 
 /**
@@ -1058,11 +1079,11 @@ HWTEST_F(UdmfClientTest, GetSummary001, TestSize.Level1)
     ASSERT_EQ(summary.summary["File.Media.Image"], record4->GetSize());
     ASSERT_EQ(summary.summary["SystemDefinedType"], record5->GetSize());
     ASSERT_EQ(summary.summary["SystemDefinedType.Form"], record6->GetSize());
+    ASSERT_EQ(summary.summary["ApplicationDefinedType"], record7->GetSize());
 
     LOG_INFO(UDMF_TEST, "GetSummary001 end.");
 }
 
-
 /**
 * @tc.name: GetSummary002
 * @tc.desc: Get summary with invalid key
diff --git a/framework/jskitsimpl/data/application_defined_record_napi.cpp b/framework/jskitsimpl/data/application_defined_record_napi.cpp
index 21b9934..fab722b 100644
--- a/framework/jskitsimpl/data/application_defined_record_napi.cpp
+++ b/framework/jskitsimpl/data/application_defined_record_napi.cpp
@@ -14,11 +14,10 @@
  */
 #include "application_defined_record_napi.h"
 
-#include "logger.h"
+#include "application_defined_record.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "application_defined_record.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {
@@ -81,8 +80,8 @@ napi_value ApplicationDefinedRecordNapi::GetApplicationDefinedType(napi_env env,
     LOG_INFO(UDMF_KITS_NAPI, "get content start");
     auto ctxt = std::make_shared<ContextBase>();
     auto record = GetApplicationDefinedRecord(env, info, ctxt);
-    ASSERT_ERR(ctxt->env, (record != nullptr && record->value_ != nullptr), Status::E_INVALID_PARAMETERS,
-        "invalid object!");
+    ASSERT_ERR(
+        ctxt->env, (record != nullptr && record->value_ != nullptr), Status::E_INVALID_PARAMETERS, "invalid object!");
     ctxt->status = NapiDataUtils::SetValue(env, record->value_->GetApplicationDefinedType(), ctxt->output);
     ASSERT_ERR(ctxt->env, ctxt->status == napi_ok, Status::E_INVALID_PARAMETERS, "set type failed!");
     return ctxt->output;
@@ -101,8 +100,8 @@ napi_value ApplicationDefinedRecordNapi::SetApplicationDefinedType(napi_env env,
     ctxt->GetCbInfoSync(env, info, input);
     ASSERT_ERR(ctxt->env, ctxt->status == napi_ok, Status::E_INVALID_PARAMETERS, "invalid arguments!");
     auto record = reinterpret_cast<ApplicationDefinedRecordNapi *>(ctxt->native);
-    ASSERT_ERR(ctxt->env, (record != nullptr && record->value_ != nullptr), Status::E_INVALID_PARAMETERS,
-        "invalid object!");
+    ASSERT_ERR(
+        ctxt->env, (record != nullptr && record->value_ != nullptr), Status::E_INVALID_PARAMETERS, "invalid object!");
     record->value_->SetApplicationDefinedType(type);
     return nullptr;
 }
diff --git a/framework/jskitsimpl/data/audio_napi.cpp b/framework/jskitsimpl/data/audio_napi.cpp
new file mode 100644
index 0000000..1f5468c
--- /dev/null
+++ b/framework/jskitsimpl/data/audio_napi.cpp
@@ -0,0 +1,71 @@
+/*
+* Copyright (c) 2023 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "audio_napi.h"
+
+#include "audio.h"
+#include "file_napi.h"
+#include "napi_data_utils.h"
+#include "napi_error_utils.h"
+#include "napi_queue.h"
+#include "unified_record_napi.h"
+
+namespace OHOS {
+namespace UDMF {
+napi_value AudioNapi::Constructor(napi_env env)
+{
+    napi_property_descriptor properties[] = {
+        /* Audio extends UnifiedRecord */
+        DECLARE_NAPI_FUNCTION("getType", UnifiedRecordNapi::GetType),
+        /* Audio extends File */
+        DECLARE_NAPI_GETTER_SETTER("details", FileNapi::GetDetails, FileNapi::SetDetails),
+        DECLARE_NAPI_GETTER_SETTER("audioUri", FileNapi::GetUri, FileNapi::SetUri),
+    };
+    size_t count = sizeof(properties) / sizeof(properties[0]);
+    return NapiDataUtils::DefineClass(env, "Audio", properties, count, AudioNapi::New);
+}
+
+napi_value AudioNapi::New(napi_env env, napi_callback_info info)
+{
+    LOG_DEBUG(UDMF_KITS_NAPI, "AudioNapi::New");
+    auto ctxt = std::make_shared<ContextBase>();
+    ctxt->GetCbInfoSync(env, info);
+    ASSERT_ERR(ctxt->env, ctxt->status == napi_ok, Status::E_INVALID_PARAMETERS, "invalid arguments!");
+
+    auto *audio = new (std::nothrow) AudioNapi();
+    ASSERT_ERR(ctxt->env, audio != nullptr, Status::E_FORBIDDEN, "no memory for audio!");
+    audio->value_ = std::make_shared<Audio>();
+    ASSERT_CALL(env, napi_wrap(env, ctxt->self, audio, Destructor, nullptr, nullptr), audio);
+    return ctxt->self;
+}
+
+void AudioNapi::NewInstance(napi_env env, std::shared_ptr<UnifiedRecord> in, napi_value &out)
+{
+    ASSERT_CALL_VOID(env, napi_new_instance(env, Constructor(env), 0, nullptr, &out));
+    auto *audio = new (std::nothrow) AudioNapi();
+    ASSERT_ERR_VOID(env, audio != nullptr, Status::E_FORBIDDEN, "no memory for audio!");
+    audio->value_ = std::reinterpret_pointer_cast<Audio>(in);
+    ASSERT_CALL_DELETE(env, napi_wrap(env, out, audio, Destructor, nullptr, nullptr), audio);
+}
+
+void AudioNapi::Destructor(napi_env env, void *data, void *hint)
+{
+    LOG_DEBUG(UDMF_KITS_NAPI, "Audio finalize.");
+    auto *audio = static_cast<AudioNapi *>(data);
+    ASSERT_VOID(audio != nullptr, "finalize null!");
+    delete audio;
+}
+} // namespace UDMF
+} // namespace OHOS
\ No newline at end of file
diff --git a/framework/jskitsimpl/data/file_napi.cpp b/framework/jskitsimpl/data/file_napi.cpp
index 49c3695..5e068f9 100644
--- a/framework/jskitsimpl/data/file_napi.cpp
+++ b/framework/jskitsimpl/data/file_napi.cpp
@@ -15,11 +15,10 @@
 
 #include "file_napi.h"
 
-#include "logger.h"
+#include "file.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "file.h"
 #include "unified_record_napi.h"
 
 namespace OHOS {
diff --git a/framework/jskitsimpl/data/folder_napi.cpp b/framework/jskitsimpl/data/folder_napi.cpp
index a7230e3..65bda6e 100644
--- a/framework/jskitsimpl/data/folder_napi.cpp
+++ b/framework/jskitsimpl/data/folder_napi.cpp
@@ -14,13 +14,12 @@
  */
 #include "folder_napi.h"
 
-#include "logger.h"
+#include "file_napi.h"
 #include "folder.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
 #include "unified_record_napi.h"
-#include "file_napi.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/jskitsimpl/data/html_napi.cpp b/framework/jskitsimpl/data/html_napi.cpp
index 9dab050..3db5bfe 100644
--- a/framework/jskitsimpl/data/html_napi.cpp
+++ b/framework/jskitsimpl/data/html_napi.cpp
@@ -15,13 +15,12 @@
 
 #include "html_napi.h"
 
-#include "logger.h"
 #include "html.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "unified_record_napi.h"
 #include "text_napi.h"
+#include "unified_record_napi.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/jskitsimpl/data/image_napi.cpp b/framework/jskitsimpl/data/image_napi.cpp
index 647cf5f..1c9a33b 100644
--- a/framework/jskitsimpl/data/image_napi.cpp
+++ b/framework/jskitsimpl/data/image_napi.cpp
@@ -15,13 +15,12 @@
 
 #include "image_napi.h"
 
-#include "logger.h"
+#include "file_napi.h"
 #include "image.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
 #include "unified_record_napi.h"
-#include "file_napi.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/jskitsimpl/data/link_napi.cpp b/framework/jskitsimpl/data/link_napi.cpp
index 90abd4f..9c9b36f 100644
--- a/framework/jskitsimpl/data/link_napi.cpp
+++ b/framework/jskitsimpl/data/link_napi.cpp
@@ -15,13 +15,12 @@
 
 #include "link_napi.h"
 
-#include "logger.h"
 #include "link.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "unified_record_napi.h"
 #include "text_napi.h"
+#include "unified_record_napi.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/jskitsimpl/data/plain_text_napi.cpp b/framework/jskitsimpl/data/plain_text_napi.cpp
index 5db5c3a..3c7df91 100644
--- a/framework/jskitsimpl/data/plain_text_napi.cpp
+++ b/framework/jskitsimpl/data/plain_text_napi.cpp
@@ -15,13 +15,12 @@
 
 #include "plain_text_napi.h"
 
-#include "logger.h"
-#include "plain_text.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "unified_record_napi.h"
+#include "plain_text.h"
 #include "text_napi.h"
+#include "unified_record_napi.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/jskitsimpl/data/summary_napi.cpp b/framework/jskitsimpl/data/summary_napi.cpp
index bec8a76..c54242f 100644
--- a/framework/jskitsimpl/data/summary_napi.cpp
+++ b/framework/jskitsimpl/data/summary_napi.cpp
@@ -15,7 +15,6 @@
 
 #include "summary_napi.h"
 
-#include "logger.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
diff --git a/framework/jskitsimpl/data/system_defined_appitem_napi.cpp b/framework/jskitsimpl/data/system_defined_appitem_napi.cpp
index fb40614..16ee7e7 100644
--- a/framework/jskitsimpl/data/system_defined_appitem_napi.cpp
+++ b/framework/jskitsimpl/data/system_defined_appitem_napi.cpp
@@ -15,13 +15,12 @@
 
 #include "system_defined_appitem_napi.h"
 
-#include "logger.h"
-#include "system_defined_appitem.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "unified_record_napi.h"
+#include "system_defined_appitem.h"
 #include "system_defined_record_napi.h"
+#include "unified_record_napi.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/jskitsimpl/data/system_defined_form_napi.cpp b/framework/jskitsimpl/data/system_defined_form_napi.cpp
index 1344269..513d292 100644
--- a/framework/jskitsimpl/data/system_defined_form_napi.cpp
+++ b/framework/jskitsimpl/data/system_defined_form_napi.cpp
@@ -15,13 +15,12 @@
 
 #include "system_defined_form_napi.h"
 
-#include "logger.h"
-#include "system_defined_form.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "unified_record_napi.h"
+#include "system_defined_form.h"
 #include "system_defined_record_napi.h"
+#include "unified_record_napi.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/jskitsimpl/data/system_defined_pixelmap_napi.cpp b/framework/jskitsimpl/data/system_defined_pixelmap_napi.cpp
index 743fbd1..b0cafbf 100644
--- a/framework/jskitsimpl/data/system_defined_pixelmap_napi.cpp
+++ b/framework/jskitsimpl/data/system_defined_pixelmap_napi.cpp
@@ -15,7 +15,6 @@
 
 #include "system_defined_pixelmap_napi.h"
 
-#include "logger.h"
 #include "system_defined_pixelmap.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
diff --git a/framework/jskitsimpl/data/system_defined_record_napi.cpp b/framework/jskitsimpl/data/system_defined_record_napi.cpp
index 5705617..22f45ac 100644
--- a/framework/jskitsimpl/data/system_defined_record_napi.cpp
+++ b/framework/jskitsimpl/data/system_defined_record_napi.cpp
@@ -15,7 +15,6 @@
 
 #include "system_defined_record_napi.h"
 
-#include "logger.h"
 #include "system_defined_record.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
diff --git a/framework/jskitsimpl/data/text_napi.cpp b/framework/jskitsimpl/data/text_napi.cpp
index 5beec89..36f6393 100644
--- a/framework/jskitsimpl/data/text_napi.cpp
+++ b/framework/jskitsimpl/data/text_napi.cpp
@@ -14,7 +14,6 @@
 */
 #include "text_napi.h"
 
-#include "logger.h"
 #include "text.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
diff --git a/framework/jskitsimpl/data/udmf_napi.cpp b/framework/jskitsimpl/data/udmf_napi.cpp
index a1463e8..32d8076 100644
--- a/framework/jskitsimpl/data/udmf_napi.cpp
+++ b/framework/jskitsimpl/data/udmf_napi.cpp
@@ -14,13 +14,9 @@
  */
 #include "udmf_napi.h"
 
-#include <unordered_map>
-
-#include "logger.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "unified_meta.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/jskitsimpl/data/unified_data_napi.cpp b/framework/jskitsimpl/data/unified_data_napi.cpp
index 01f5eab..21749c5 100644
--- a/framework/jskitsimpl/data/unified_data_napi.cpp
+++ b/framework/jskitsimpl/data/unified_data_napi.cpp
@@ -15,25 +15,25 @@
 
 #include "unified_data_napi.h"
 
-#include "logger.h"
+#include "application_defined_record_napi.h"
+#include "audio_napi.h"
+#include "file_napi.h"
+#include "folder_napi.h"
+#include "html_napi.h"
+#include "image_napi.h"
+#include "link_napi.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "unified_data.h"
-#include "unified_meta.h"
-#include "image.h"
-#include "image_napi.h"
-#include "text_napi.h"
 #include "plain_text_napi.h"
-#include "html_napi.h"
-#include "link_napi.h"
-#include "image_napi.h"
-#include "video_napi.h"
-#include "system_defined_record_napi.h"
 #include "system_defined_appitem_napi.h"
 #include "system_defined_form_napi.h"
 #include "system_defined_pixelmap_napi.h"
+#include "system_defined_record_napi.h"
+#include "text_napi.h"
+#include "unified_data.h"
 #include "unified_record_napi.h"
+#include "video_napi.h"
 
 namespace OHOS {
 namespace UDMF {
@@ -164,6 +164,10 @@ void UnifiedDataNapi::GetRecord(napi_env env, std::shared_ptr<UnifiedRecord> in,
             LinkNapi::NewInstance(env, in, out);
             break;
         }
+        case FILE: {
+            FileNapi::NewInstance(env, in, out);
+            break;
+        }
         case IMAGE: {
             ImageNapi::NewInstance(env, in, out);
             break;
@@ -172,6 +176,14 @@ void UnifiedDataNapi::GetRecord(napi_env env, std::shared_ptr<UnifiedRecord> in,
             VideoNapi::NewInstance(env, in, out);
             break;
         }
+        case AUDIO: {
+            AudioNapi::NewInstance(env, in, out);
+            break;
+        }
+        case FOLDER: {
+            FolderNapi::NewInstance(env, in, out);
+            break;
+        }
         case SYSTEM_DEFINED_RECORD: {
             SystemDefinedRecordNapi::NewInstance(env, in, out);
             break;
@@ -188,6 +200,10 @@ void UnifiedDataNapi::GetRecord(napi_env env, std::shared_ptr<UnifiedRecord> in,
             SystemDefinedPixelMapNapi::NewInstance(env, in, out);
             break;
         }
+        case APPLICATION_DEFINED_RECORD: {
+            ApplicationDefinedRecordNapi::NewInstance(env, in, out);
+            break;
+        }
         default:
             LOG_INFO(UDMF_KITS_NAPI, "GetRecord default");
             break;
diff --git a/framework/jskitsimpl/data/unified_record_napi.cpp b/framework/jskitsimpl/data/unified_record_napi.cpp
index e8fef70..f296e11 100644
--- a/framework/jskitsimpl/data/unified_record_napi.cpp
+++ b/framework/jskitsimpl/data/unified_record_napi.cpp
@@ -15,11 +15,9 @@
 
 #include "unified_record_napi.h"
 
-#include "logger.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
-#include "unified_meta.h"
 #include "unified_record.h"
 
 namespace OHOS {
diff --git a/framework/jskitsimpl/data/video_napi.cpp b/framework/jskitsimpl/data/video_napi.cpp
index e089f24..0eda3d6 100644
--- a/framework/jskitsimpl/data/video_napi.cpp
+++ b/framework/jskitsimpl/data/video_napi.cpp
@@ -15,13 +15,12 @@
 
 #include "video_napi.h"
 
-#include "logger.h"
-#include "video.h"
+#include "file_napi.h"
 #include "napi_data_utils.h"
 #include "napi_error_utils.h"
 #include "napi_queue.h"
 #include "unified_record_napi.h"
-#include "file_napi.h"
+#include "video.h"
 
 namespace OHOS {
 namespace UDMF {
diff --git a/framework/manager/data_manager.cpp b/framework/manager/data_manager.cpp
index 1c9834f..ed7f609 100755
--- a/framework/manager/data_manager.cpp
+++ b/framework/manager/data_manager.cpp
@@ -119,7 +119,8 @@ int32_t DataManager::RetrieveData(QueryOption &query, UnifiedData &unifiedData)
         for (auto record : records) {
             auto type = record->GetType();
             std::string uri = "";
-            if (type == UDType::FILE || type == UDType::IMAGE || type == UDType::VIDEO || type == UDType::FOLDER) {
+            if (type == UDType::FILE || type == UDType::IMAGE || type == UDType::VIDEO || type == UDType::AUDIO
+                || type == UDType::FOLDER) {
                 auto file = static_cast<File *>(record.get());
                 uri = file->GetUri();
             }
diff --git a/framework/manager/data_manager.h b/framework/manager/data_manager.h
index 28d4c34..c63a1f4 100755
--- a/framework/manager/data_manager.h
+++ b/framework/manager/data_manager.h
@@ -47,4 +47,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_DATA_MANAGER_H
+#endif // UDMF_DATA_MANAGER_H
diff --git a/framework/manager/lifecycle/clean_after_get.h b/framework/manager/lifecycle/clean_after_get.h
index 94b7142..1e94b5f 100644
--- a/framework/manager/lifecycle/clean_after_get.h
+++ b/framework/manager/lifecycle/clean_after_get.h
@@ -23,4 +23,4 @@ public:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_CLEAN_AFTER_GET_H
+#endif // UDMF_CLEAN_AFTER_GET_H
diff --git a/framework/manager/lifecycle/clean_on_startup.h b/framework/manager/lifecycle/clean_on_startup.h
index 0540455..b269743 100644
--- a/framework/manager/lifecycle/clean_on_startup.h
+++ b/framework/manager/lifecycle/clean_on_startup.h
@@ -25,4 +25,4 @@ public:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_CLEAN_ON_STARTUP_H
+#endif // UDMF_CLEAN_ON_STARTUP_H
diff --git a/framework/manager/lifecycle/clean_on_timeout.h b/framework/manager/lifecycle/clean_on_timeout.h
index 09d42c9..d86be25 100644
--- a/framework/manager/lifecycle/clean_on_timeout.h
+++ b/framework/manager/lifecycle/clean_on_timeout.h
@@ -23,7 +23,6 @@ public:
     Status DeleteOnStart(const std::string &intention) override;
     Status DeleteOnGet(const UnifiedKey &key) override;
 };
-
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_CLEAN_ON_TIMEOUT_H
+#endif // UDMF_CLEAN_ON_TIMEOUT_H
diff --git a/framework/manager/lifecycle/lifecycle_manager.h b/framework/manager/lifecycle/lifecycle_manager.h
index d54e05c..e73032d 100644
--- a/framework/manager/lifecycle/lifecycle_manager.h
+++ b/framework/manager/lifecycle/lifecycle_manager.h
@@ -44,4 +44,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_LIFECYCLE_MANAGER_H
+#endif // UDMF_LIFECYCLE_MANAGER_H
diff --git a/framework/manager/lifecycle/lifecycle_policy.h b/framework/manager/lifecycle/lifecycle_policy.h
index 1973527..8289013 100644
--- a/framework/manager/lifecycle/lifecycle_policy.h
+++ b/framework/manager/lifecycle/lifecycle_policy.h
@@ -42,4 +42,4 @@ private:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_LIFECYCLE_POLICY_H
+#endif // UDMF_LIFECYCLE_POLICY_H
diff --git a/framework/manager/preprocess/preprocess_utils.cpp b/framework/manager/preprocess/preprocess_utils.cpp
index 3105b4d..3e04784 100755
--- a/framework/manager/preprocess/preprocess_utils.cpp
+++ b/framework/manager/preprocess/preprocess_utils.cpp
@@ -70,7 +70,7 @@ time_t PreProcessUtils::GetTimeStamp()
 {
     std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds> tp =
         std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now());
-    std::time_t timestamp = tp.time_since_epoch().count();
+    time_t timestamp = tp.time_since_epoch().count();
     return timestamp;
 }
 
diff --git a/framework/manager/preprocess/preprocess_utils.h b/framework/manager/preprocess/preprocess_utils.h
index a19424b..d15d8da 100644
--- a/framework/manager/preprocess/preprocess_utils.h
+++ b/framework/manager/preprocess/preprocess_utils.h
@@ -41,4 +41,4 @@ public:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_PREPROCESS_UTILS_H
+#endif // UDMF_PREPROCESS_UTILS_H
diff --git a/framework/manager/store/runtime_store.h b/framework/manager/store/runtime_store.h
index cc4b734..597d0f5 100755
--- a/framework/manager/store/runtime_store.h
+++ b/framework/manager/store/runtime_store.h
@@ -53,4 +53,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_RUNTIMESTORE_H
\ No newline at end of file
+#endif // UDMF_RUNTIMESTORE_H
diff --git a/framework/manager/store/store.h b/framework/manager/store/store.h
index d7eb692..de2b8e3 100755
--- a/framework/manager/store/store.h
+++ b/framework/manager/store/store.h
@@ -40,4 +40,4 @@ public:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_STORE_H
+#endif // UDMF_STORE_H
diff --git a/framework/manager/store/store_cache.h b/framework/manager/store/store_cache.h
index ad2d6c0..12374c1 100755
--- a/framework/manager/store/store_cache.h
+++ b/framework/manager/store/store_cache.h
@@ -33,4 +33,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_STORE_CACHE_H
+#endif // UDMF_STORE_CACHE_H
diff --git a/framework/service/udmf_service.h b/framework/service/udmf_service.h
index a501e5f..481b85f 100755
--- a/framework/service/udmf_service.h
+++ b/framework/service/udmf_service.h
@@ -43,6 +43,10 @@ public:
     virtual int32_t AddPrivilege(QueryOption &query, Privilege &privilege) = 0;
     virtual int32_t Sync(const QueryOption &query, const std::vector<std::string> &devices) = 0;
 
+    static constexpr int32_t MAX_DATA_SIZE = 4 * 1024 * 1024;
+    static constexpr int32_t MAX_RECORD_SIZE = 2 * 1024 * 1024;
+    static constexpr int32_t MAX_RECORD_NUM = 512;
+
 protected:
     enum FCode {
         CODE_HEAD,
diff --git a/framework/service/udmf_service_proxy.cpp b/framework/service/udmf_service_proxy.cpp
index 6d8c03a..8648241 100755
--- a/framework/service/udmf_service_proxy.cpp
+++ b/framework/service/udmf_service_proxy.cpp
@@ -47,7 +47,7 @@ namespace UDMF {
         __status;                                                      \
     })
 
-static constexpr int32_t UDMF_MAX_DATA_SIZE = 5 * 1024 * 1024;
+
 UdmfServiceProxy::UdmfServiceProxy(const sptr<IRemoteObject> &object) : IRemoteProxy<IUdmfService>(object)
 {
 }
@@ -59,14 +59,24 @@ int32_t UdmfServiceProxy::SetData(CustomOption &option, UnifiedData &unifiedData
         LOG_ERROR(UDMF_SERVICE, "Invalid intention");
         return E_INVALID_PARAMETERS;
     }
-    if (unifiedData.GetSize() > UDMF_MAX_DATA_SIZE) {
-        LOG_ERROR(UDMF_SERVICE, "Exceeded the limit!");
+    if (unifiedData.GetRecords().empty()) {
+        LOG_ERROR(UDMF_SERVICE, "Empty data without any record!");
         return E_INVALID_VALUE;
     }
-    if (unifiedData.GetRecords().empty()) {
-        LOG_ERROR(UDMF_SERVICE, "Invalid data!");
+    if (unifiedData.GetRecords().size() > UdmfService::MAX_RECORD_NUM) {
+        LOG_ERROR(UDMF_SERVICE, "Excessive record: %{public}d!", unifiedData.GetRecords().size());
         return E_INVALID_VALUE;
     }
+    if (unifiedData.GetSize() > UdmfService::MAX_DATA_SIZE) {
+        LOG_ERROR(UDMF_SERVICE, "Exceeded data limit!");
+        return E_INVALID_VALUE;
+    }
+    for (std::shared_ptr<UnifiedRecord> record : unifiedData.GetRecords()) {
+        if (unifiedData.GetSize() > UdmfService::MAX_RECORD_SIZE) {
+            LOG_ERROR(UDMF_SERVICE, "Exceeded record limit!");
+            return E_INVALID_VALUE;
+        }
+    }
     MessageParcel reply;
     int32_t status = IPC_SEND(SET_DATA, reply, option, unifiedData);
     if (status != E_OK) {
diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn
index f52bca9..7a95ab9 100755
--- a/interfaces/innerkits/BUILD.gn
+++ b/interfaces/innerkits/BUILD.gn
@@ -41,6 +41,7 @@ ohos_shared_library("udmf_client") {
     "${udmf_framework_path}/innerkitsimpl/common/unified_key.cpp",
     "${udmf_framework_path}/innerkitsimpl/common/unified_meta.cpp",
     "${udmf_framework_path}/innerkitsimpl/data/application_defined_record.cpp",
+    "${udmf_framework_path}/innerkitsimpl/data/audio.cpp",
     "${udmf_framework_path}/innerkitsimpl/data/file.cpp",
     "${udmf_framework_path}/innerkitsimpl/data/folder.cpp",
     "${udmf_framework_path}/innerkitsimpl/data/html.cpp",
@@ -55,18 +56,18 @@ ohos_shared_library("udmf_client") {
     "${udmf_framework_path}/innerkitsimpl/data/unified_data.cpp",
     "${udmf_framework_path}/innerkitsimpl/data/unified_record.cpp",
     "${udmf_framework_path}/innerkitsimpl/data/video.cpp",
+    "${udmf_framework_path}/manager/data_manager.cpp",
+    "${udmf_framework_path}/manager/lifecycle/clean_after_get.cpp",
+    "${udmf_framework_path}/manager/lifecycle/clean_on_startup.cpp",
+    "${udmf_framework_path}/manager/lifecycle/clean_on_timeout.cpp",
+    "${udmf_framework_path}/manager/lifecycle/lifecycle_manager.cpp",
+    "${udmf_framework_path}/manager/lifecycle/lifecycle_policy.cpp",
     "${udmf_framework_path}/manager/permission/checker_manager.cpp",
     "${udmf_framework_path}/manager/permission/data_checker.cpp",
     "${udmf_framework_path}/manager/permission/uri_permission_manager.cpp",
     "${udmf_framework_path}/manager/preprocess/preprocess_utils.cpp",
-    "${udmf_framework_path}/manager/store/store_cache.cpp",
     "${udmf_framework_path}/manager/store/runtime_store.cpp",
-    "${udmf_framework_path}/manager/data_manager.cpp",
-    "${udmf_framework_path}/manager/lifecycle/lifecycle_manager.cpp",
-    "${udmf_framework_path}/manager/lifecycle/lifecycle_policy.cpp",
-    "${udmf_framework_path}/manager/lifecycle/clean_on_startup.cpp",
-    "${udmf_framework_path}/manager/lifecycle/clean_after_get.cpp",
-    "${udmf_framework_path}/manager/lifecycle/clean_on_timeout.cpp",
+    "${udmf_framework_path}/manager/store/store_cache.cpp",
     "${udmf_framework_path}/service/udmf_service_client.cpp",
     "${udmf_framework_path}/service/udmf_service_proxy.cpp",
   ]
@@ -74,8 +75,8 @@ ohos_shared_library("udmf_client") {
   public_configs = [ ":udmf_client_config" ]
 
   deps = [
-    "//foundation/filemanagement/app_file_service/interfaces/innerkits/remote_file_share/native:remote_file_share_native",
-    "//foundation/ability/ability_runtime/interfaces/inner_api/uri_permission:uri_permission_mgr",
+    "${aafwk_inner_api_path}/uri_permission:uri_permission_mgr",
+    "${file_service_path}/interfaces/innerkits/remote_file_share/native:remote_file_share_native",
   ]
 
   external_deps = [
diff --git a/interfaces/innerkits/common/error_code.h b/interfaces/innerkits/common/error_code.h
index 896553b..96febf4 100755
--- a/interfaces/innerkits/common/error_code.h
+++ b/interfaces/innerkits/common/error_code.h
@@ -52,4 +52,4 @@ enum Status : int32_t {
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_ERROR_CODE_H
\ No newline at end of file
+#endif // UDMF_ERROR_CODE_H
\ No newline at end of file
diff --git a/interfaces/innerkits/common/unified_meta.h b/interfaces/innerkits/common/unified_meta.h
index 0b090ee..8e87571 100644
--- a/interfaces/innerkits/common/unified_meta.h
+++ b/interfaces/innerkits/common/unified_meta.h
@@ -85,6 +85,7 @@ static const std::unordered_map<int32_t, std::string> JS_UD_TYPE_NAME_MAP {
     { FILE, "FILE" },
     { IMAGE, "IMAGE" },
     { VIDEO, "VIDEO" },
+    { AUDIO, "AUDIO" },
     { FOLDER, "FOLDER" },
     { SYSTEM_DEFINED_RECORD, "SYSTEM_DEFINED_RECORD" },
     { SYSTEM_DEFINED_FORM, "SYSTEM_DEFINED_FORM" },
@@ -128,4 +129,4 @@ public:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UNIFIED_META_H
\ No newline at end of file
+#endif // UNIFIED_META_H
\ No newline at end of file
diff --git a/interfaces/innerkits/common/unified_types.h b/interfaces/innerkits/common/unified_types.h
index 1db8358..506a5c7 100755
--- a/interfaces/innerkits/common/unified_types.h
+++ b/interfaces/innerkits/common/unified_types.h
@@ -45,18 +45,18 @@ struct Privilege {
 
 struct Runtime {
     UnifiedKey key;
-    bool isPrivate{};
+    bool isPrivate {};
     std::vector<Privilege> privileges;
     // time when the data is created
-    time_t createTime{};
+    time_t createTime {};
     // name of the package for creating data
     std::string sourcePackage;
     // current data status
-    DataStatus dataStatus{WORKING};
+    DataStatus dataStatus { WORKING };
     // current data version
-    std::int32_t dataVersion{};
+    std::int32_t dataVersion {};
     // time when the data is last modified
-    time_t lastModifiedTime{};
+    time_t lastModifiedTime {};
     // time when data is written to the udmf
     std::string createPackage;
     // device ID of the data source
@@ -67,8 +67,8 @@ struct Runtime {
  * Options for sharing data through UDMF.
  */
 struct CustomOption {
-    Intention intention{};
-    int32_t tokenId{};
+    Intention intention {};
+    int32_t tokenId {};
 };
 
 /*
@@ -76,9 +76,9 @@ struct CustomOption {
  */
 struct QueryOption {
     std::string key;
-    int32_t tokenId{};
-    int32_t pid{};
+    int32_t tokenId {};
+    int32_t pid {};
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_UNIFIED_TYPES_H
+#endif // UDMF_UNIFIED_TYPES_H
diff --git a/interfaces/innerkits/data/audio.h b/interfaces/innerkits/data/audio.h
new file mode 100644
index 0000000..00adcde
--- /dev/null
+++ b/interfaces/innerkits/data/audio.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef UDMF_AUDIO_H
+#define UDMF_AUDIO_H
+
+#include "file.h"
+
+namespace OHOS {
+namespace UDMF {
+class Audio : public File {
+public:
+    Audio();
+    explicit Audio(const std::string &uri);
+};
+} // namespace UDMF
+} // namespace OHOS
+
+#endif // UDMF_AUDIO_H
diff --git a/interfaces/innerkits/data/html.h b/interfaces/innerkits/data/html.h
index 194d846..f696d3c 100644
--- a/interfaces/innerkits/data/html.h
+++ b/interfaces/innerkits/data/html.h
@@ -39,4 +39,4 @@ private:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_HTML_H
+#endif // UDMF_HTML_H
diff --git a/interfaces/innerkits/data/image.h b/interfaces/innerkits/data/image.h
index afad730..0a07e35 100644
--- a/interfaces/innerkits/data/image.h
+++ b/interfaces/innerkits/data/image.h
@@ -28,4 +28,4 @@ public:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_IMAGE_H
+#endif // UDMF_IMAGE_H
diff --git a/interfaces/innerkits/data/link.h b/interfaces/innerkits/data/link.h
index e6b53f4..b28cb21 100644
--- a/interfaces/innerkits/data/link.h
+++ b/interfaces/innerkits/data/link.h
@@ -39,4 +39,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_LINK_H
+#endif // UDMF_LINK_H
diff --git a/interfaces/innerkits/data/plain_text.h b/interfaces/innerkits/data/plain_text.h
index edf7c52..e6cdfaa 100644
--- a/interfaces/innerkits/data/plain_text.h
+++ b/interfaces/innerkits/data/plain_text.h
@@ -39,4 +39,4 @@ private:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_PLAIN_TEXT_H
+#endif // UDMF_PLAIN_TEXT_H
diff --git a/interfaces/innerkits/data/system_defined_appitem.h b/interfaces/innerkits/data/system_defined_appitem.h
index f28e8dc..6cdbb38 100644
--- a/interfaces/innerkits/data/system_defined_appitem.h
+++ b/interfaces/innerkits/data/system_defined_appitem.h
@@ -49,4 +49,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_SYSTEM_DEFINED_APPITEM_H
+#endif // UDMF_SYSTEM_DEFINED_APPITEM_H
diff --git a/interfaces/innerkits/data/system_defined_form.h b/interfaces/innerkits/data/system_defined_form.h
index 20a8c80..f6f3059 100644
--- a/interfaces/innerkits/data/system_defined_form.h
+++ b/interfaces/innerkits/data/system_defined_form.h
@@ -46,4 +46,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_SYSTEM_DEFINED_FORM_H
+#endif // UDMF_SYSTEM_DEFINED_FORM_H
diff --git a/interfaces/innerkits/data/system_defined_pixelmap.h b/interfaces/innerkits/data/system_defined_pixelmap.h
index c0369dc..9d3cc75 100644
--- a/interfaces/innerkits/data/system_defined_pixelmap.h
+++ b/interfaces/innerkits/data/system_defined_pixelmap.h
@@ -34,4 +34,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_SYSTEM_DEFINED_PIXELMAP_H
+#endif // UDMF_SYSTEM_DEFINED_PIXELMAP_H
diff --git a/interfaces/innerkits/data/system_defined_record.h b/interfaces/innerkits/data/system_defined_record.h
index 683b2ae..ecf51c2 100644
--- a/interfaces/innerkits/data/system_defined_record.h
+++ b/interfaces/innerkits/data/system_defined_record.h
@@ -36,4 +36,4 @@ protected:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_SYSTEM_DEFINED_RECORD_H
\ No newline at end of file
+#endif // UDMF_SYSTEM_DEFINED_RECORD_H
\ No newline at end of file
diff --git a/interfaces/innerkits/data/text.h b/interfaces/innerkits/data/text.h
index 7288954..82369c7 100644
--- a/interfaces/innerkits/data/text.h
+++ b/interfaces/innerkits/data/text.h
@@ -37,4 +37,4 @@ protected:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_TEXT_H
+#endif // UDMF_TEXT_H
diff --git a/interfaces/innerkits/data/unified_data.h b/interfaces/innerkits/data/unified_data.h
index ba9adbf..2cc052d 100755
--- a/interfaces/innerkits/data/unified_data.h
+++ b/interfaces/innerkits/data/unified_data.h
@@ -22,8 +22,6 @@ namespace OHOS {
 namespace UDMF {
 class UnifiedData {
 public:
-    static constexpr std::uint32_t MAX_RECORD_NUM = 512;
-
     int64_t GetSize();
 
     std::string GetGroupId() const;
@@ -46,4 +44,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_UNIFIED_DATA_H
+#endif // UDMF_UNIFIED_DATA_H
diff --git a/interfaces/innerkits/data/unified_record.h b/interfaces/innerkits/data/unified_record.h
index 384fe82..ade232a 100644
--- a/interfaces/innerkits/data/unified_record.h
+++ b/interfaces/innerkits/data/unified_record.h
@@ -21,7 +21,6 @@
 #include <variant>
 #include <vector>
 
-#include "unified_meta.h"
 #include "unified_types.h"
 
 namespace OHOS {
@@ -47,4 +46,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_UNIFIED_RECORD_H
+#endif // UDMF_UNIFIED_RECORD_H
diff --git a/interfaces/innerkits/data/video.h b/interfaces/innerkits/data/video.h
index 4202fbe..ea80bf8 100644
--- a/interfaces/innerkits/data/video.h
+++ b/interfaces/innerkits/data/video.h
@@ -27,4 +27,4 @@ public:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_VIDEO_H
+#endif // UDMF_VIDEO_H
diff --git a/interfaces/jskits/BUILD.gn b/interfaces/jskits/BUILD.gn
index 011c610..2fda6d2 100755
--- a/interfaces/jskits/BUILD.gn
+++ b/interfaces/jskits/BUILD.gn
@@ -35,9 +35,9 @@ config("udmf_napi_config") {
     "//commonlibrary/c_utils/base/include",
 
     "${aafwk_inner_api_path}/ability_manager/include",
-    "//foundation/ability/ability_runtime/frameworks/js/napi/inner/napi_common",
     "${aafwk_kits_path}/appkit/native/app/include/",
     "${aafwk_kits_path}/ability/native/include",
+    "${aafwk_napi_path}/inner/napi_common",
     "${aafwk_service_path}/abilitymgr/include",
     "${aafwk_service_path}/common/include",
   ]
@@ -45,21 +45,22 @@ config("udmf_napi_config") {
 
 ohos_shared_library("udmf_napi") {
   sources = [
-    "${udmf_framework_path}/jskitsimpl/common/napi_queue.cpp",
     "${udmf_framework_path}/jskitsimpl/common/napi_data_utils.cpp",
     "${udmf_framework_path}/jskitsimpl/common/napi_error_utils.cpp",
+    "${udmf_framework_path}/jskitsimpl/common/napi_queue.cpp",
     "${udmf_framework_path}/jskitsimpl/data/application_defined_record_napi.cpp",
+    "${udmf_framework_path}/jskitsimpl/data/audio_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/file_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/folder_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/html_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/image_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/link_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/plain_text_napi.cpp",
+    "${udmf_framework_path}/jskitsimpl/data/summary_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/system_defined_appitem_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/system_defined_form_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/system_defined_pixelmap_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/system_defined_record_napi.cpp",
-    "${udmf_framework_path}/jskitsimpl/data/summary_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/text_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/udmf_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/unified_data_napi.cpp",
@@ -70,16 +71,16 @@ ohos_shared_library("udmf_napi") {
   public_configs = [ ":udmf_napi_config" ]
 
   deps = [
-    "//foundation/arkui/napi:ace_napi",
-    "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_client",
-    "//third_party/bounds_checking_function:libsec_static",
+    "${arkui_path}/napi:ace_napi",
+    "${third_party_path}/bounds_checking_function:libsec_static",
+    "../innerkits:udmf_client",
   ]
 
   external_deps = [
+    "ability_base:base",
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
     "ability_runtime:napi_base_context",
-    "ability_base:base",
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
@@ -91,23 +92,24 @@ ohos_shared_library("udmf_napi") {
   part_name = "udmf"
 }
 
-ohos_shared_library("udmf_data_napi"){
-  sources=[
-    "${udmf_framework_path}/jskitsimpl/common/napi_queue.cpp",
+ohos_shared_library("udmf_data_napi") {
+  sources = [
     "${udmf_framework_path}/jskitsimpl/common/napi_data_utils.cpp",
     "${udmf_framework_path}/jskitsimpl/common/napi_error_utils.cpp",
+    "${udmf_framework_path}/jskitsimpl/common/napi_queue.cpp",
     "${udmf_framework_path}/jskitsimpl/data/application_defined_record_napi.cpp",
+    "${udmf_framework_path}/jskitsimpl/data/audio_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/file_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/folder_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/html_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/image_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/link_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/plain_text_napi.cpp",
+    "${udmf_framework_path}/jskitsimpl/data/summary_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/system_defined_appitem_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/system_defined_form_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/system_defined_pixelmap_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/system_defined_record_napi.cpp",
-    "${udmf_framework_path}/jskitsimpl/data/summary_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/text_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/udmf_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/unified_data_napi.cpp",
@@ -115,25 +117,25 @@ ohos_shared_library("udmf_data_napi"){
     "${udmf_framework_path}/jskitsimpl/data/video_napi.cpp",
     "${udmf_interfaces_path}/jskits/module/udmf_napi_module.cpp",
   ]
-  public_configs=[":udmf_napi_config"]
+  public_configs = [ ":udmf_napi_config" ]
 
-  deps=[
-    "//foundation/arkui/napi:ace_napi",
-    "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_client",
-    "//third_party/bounds_checking_function:libsec_static",
+  deps = [
+    "${arkui_path}/napi:ace_napi",
+    "${third_party_path}/bounds_checking_function:libsec_static",
+    "../innerkits:udmf_client",
   ]
 
-  external_deps=[
+  external_deps = [
+    "ability_base:base",
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
     "ability_runtime:napi_base_context",
-    "ability_base:base",
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
   ]
 
-  subsystem_name="distributeddatamgr"
-  part_name="udmf"
+  subsystem_name = "distributeddatamgr"
+  part_name = "udmf"
 }
diff --git a/interfaces/jskits/common/napi_error_utils.h b/interfaces/jskits/common/napi_error_utils.h
index b030e5b..928b66f 100644
--- a/interfaces/jskits/common/napi_error_utils.h
+++ b/interfaces/jskits/common/napi_error_utils.h
@@ -73,7 +73,6 @@ napi_value GenerateErrorMsg(napi_env env, NapiErrorCode jsInfo);
             return;                                                 \
         }                                                           \
     } while (0)
-
 } // namespace UDMF
 } // namespace OHOS
 #endif // UDMF_ERROR_UTILS_H
diff --git a/interfaces/jskits/common/napi_queue.h b/interfaces/jskits/common/napi_queue.h
index 2248a78..d3163c2 100644
--- a/interfaces/jskits/common/napi_queue.h
+++ b/interfaces/jskits/common/napi_queue.h
@@ -154,4 +154,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_NAPI_QUEUE_H
+#endif // UDMF_NAPI_QUEUE_H
diff --git a/interfaces/jskits/data/audio_napi.h b/interfaces/jskits/data/audio_napi.h
new file mode 100644
index 0000000..a6e6d43
--- /dev/null
+++ b/interfaces/jskits/data/audio_napi.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef UDMF_AUDIO_NAPI_H
+#define UDMF_AUDIO_NAPI_H
+
+#include <memory>
+
+#include "napi/native_api.h"
+#include "napi/native_node_api.h"
+
+namespace OHOS {
+namespace UDMF {
+struct ContextBase;
+class UnifiedRecord;
+class Audio;
+class AudioNapi {
+public:
+    static napi_value Constructor(napi_env env);
+    static void NewInstance(napi_env env, std::shared_ptr<UnifiedRecord> in, napi_value &out);
+    std::shared_ptr<Audio> value_;
+
+private:
+    static napi_value New(napi_env env, napi_callback_info info);
+    static void Destructor(napi_env env, void *data, void *hint);
+};
+} // namespace UDMF
+} // namespace OHOS
+#endif // UDMF_AUDIO_NAPI_H
diff --git a/interfaces/jskits/data/html_napi.h b/interfaces/jskits/data/html_napi.h
index 432377a..8807a26 100644
--- a/interfaces/jskits/data/html_napi.h
+++ b/interfaces/jskits/data/html_napi.h
@@ -44,4 +44,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_HTML_NAPI_H
+#endif // UDMF_HTML_NAPI_H
diff --git a/interfaces/jskits/data/image_napi.h b/interfaces/jskits/data/image_napi.h
index ccc064d..5917661 100644
--- a/interfaces/jskits/data/image_napi.h
+++ b/interfaces/jskits/data/image_napi.h
@@ -38,4 +38,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_IMAGE_NAPI_H
+#endif // UDMF_IMAGE_NAPI_H
diff --git a/interfaces/jskits/data/link_napi.h b/interfaces/jskits/data/link_napi.h
index 8d5b4f4..081457d 100644
--- a/interfaces/jskits/data/link_napi.h
+++ b/interfaces/jskits/data/link_napi.h
@@ -45,4 +45,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_LINK_NAPI_H
+#endif // UDMF_LINK_NAPI_H
diff --git a/interfaces/jskits/data/plain_text_napi.h b/interfaces/jskits/data/plain_text_napi.h
index d0a8762..6762060 100644
--- a/interfaces/jskits/data/plain_text_napi.h
+++ b/interfaces/jskits/data/plain_text_napi.h
@@ -44,4 +44,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_PLAIN_TEXT_NAPI_H
\ No newline at end of file
+#endif // UDMF_PLAIN_TEXT_NAPI_H
\ No newline at end of file
diff --git a/interfaces/jskits/data/summary_napi.h b/interfaces/jskits/data/summary_napi.h
index ba506ea..069cabf 100644
--- a/interfaces/jskits/data/summary_napi.h
+++ b/interfaces/jskits/data/summary_napi.h
@@ -41,4 +41,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_SUMMARY_NAPI_H
\ No newline at end of file
+#endif // UDMF_SUMMARY_NAPI_H
\ No newline at end of file
diff --git a/interfaces/jskits/data/system_defined_appitem_napi.h b/interfaces/jskits/data/system_defined_appitem_napi.h
index be31ec0..deef608 100644
--- a/interfaces/jskits/data/system_defined_appitem_napi.h
+++ b/interfaces/jskits/data/system_defined_appitem_napi.h
@@ -59,4 +59,4 @@ private:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_SYSTEM_DEFINED_APPITEM_NAPI_H
+#endif // UDMF_SYSTEM_DEFINED_APPITEM_NAPI_H
diff --git a/interfaces/jskits/data/system_defined_form_napi.h b/interfaces/jskits/data/system_defined_form_napi.h
index 49bc191..191ba59 100644
--- a/interfaces/jskits/data/system_defined_form_napi.h
+++ b/interfaces/jskits/data/system_defined_form_napi.h
@@ -56,4 +56,4 @@ private:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_SYSTEM_DEFINED_FORM_NAPI_H
+#endif // UDMF_SYSTEM_DEFINED_FORM_NAPI_H
diff --git a/interfaces/jskits/data/system_defined_pixelmap_napi.h b/interfaces/jskits/data/system_defined_pixelmap_napi.h
index 24b5ca7..eb64b3b 100644
--- a/interfaces/jskits/data/system_defined_pixelmap_napi.h
+++ b/interfaces/jskits/data/system_defined_pixelmap_napi.h
@@ -44,4 +44,4 @@ private:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_SYSTEM_DEFINED_PIXELMAP_NAPI_H
+#endif // UDMF_SYSTEM_DEFINED_PIXELMAP_NAPI_H
diff --git a/interfaces/jskits/data/system_defined_record_napi.h b/interfaces/jskits/data/system_defined_record_napi.h
index 82804ba..8881c49 100644
--- a/interfaces/jskits/data/system_defined_record_napi.h
+++ b/interfaces/jskits/data/system_defined_record_napi.h
@@ -42,4 +42,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_SYSTEM_DEFINED_RECORD_NAPI_H
\ No newline at end of file
+#endif // UDMF_SYSTEM_DEFINED_RECORD_NAPI_H
\ No newline at end of file
diff --git a/interfaces/jskits/data/text_napi.h b/interfaces/jskits/data/text_napi.h
index 0fa10a6..110f12d 100644
--- a/interfaces/jskits/data/text_napi.h
+++ b/interfaces/jskits/data/text_napi.h
@@ -41,4 +41,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_TEXT_NAPI_H
\ No newline at end of file
+#endif // UDMF_TEXT_NAPI_H
\ No newline at end of file
diff --git a/interfaces/jskits/data/udmf_napi.h b/interfaces/jskits/data/udmf_napi.h
index 4a355c8..18532d9 100644
--- a/interfaces/jskits/data/udmf_napi.h
+++ b/interfaces/jskits/data/udmf_napi.h
@@ -35,4 +35,4 @@ private:
 } // namespace UDMF
 } // namespace OHOS
 
-#endif //UDMF_NAPI_H
+#endif // UDMF_NAPI_H
diff --git a/interfaces/jskits/data/unified_data_napi.h b/interfaces/jskits/data/unified_data_napi.h
index 8d80c64..f9cd9be 100644
--- a/interfaces/jskits/data/unified_data_napi.h
+++ b/interfaces/jskits/data/unified_data_napi.h
@@ -41,4 +41,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_UNIFIED_DATA_NAPI_H
+#endif // UDMF_UNIFIED_DATA_NAPI_H
diff --git a/interfaces/jskits/data/unified_record_napi.h b/interfaces/jskits/data/unified_record_napi.h
index 9113363..c3833df 100644
--- a/interfaces/jskits/data/unified_record_napi.h
+++ b/interfaces/jskits/data/unified_record_napi.h
@@ -39,4 +39,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_UNIFIED_RECORD_NAPI_H
+#endif // UDMF_UNIFIED_RECORD_NAPI_H
diff --git a/interfaces/jskits/data/video_napi.h b/interfaces/jskits/data/video_napi.h
index 423835f..b3127c5 100644
--- a/interfaces/jskits/data/video_napi.h
+++ b/interfaces/jskits/data/video_napi.h
@@ -38,4 +38,4 @@ private:
 };
 } // namespace UDMF
 } // namespace OHOS
-#endif //UDMF_VIDEO_NAPI_H
+#endif // UDMF_VIDEO_NAPI_H
diff --git a/interfaces/jskits/module/udmf_napi_module.cpp b/interfaces/jskits/module/udmf_napi_module.cpp
index f0c2664..fdc5c41 100644
--- a/interfaces/jskits/module/udmf_napi_module.cpp
+++ b/interfaces/jskits/module/udmf_napi_module.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "application_defined_record_napi.h"
+#include "audio_napi.h"
 #include "file_napi.h"
 #include "folder_napi.h"
 #include "html_napi.h"
@@ -60,6 +61,8 @@ static napi_value Init(napi_env env, napi_value exports)
     LOG_INFO(UDMF_KITS_NAPI, "init Image %{public}d", status);
     status = napi_set_named_property(env, exports, "Video", OHOS::UDMF::VideoNapi::Constructor(env));
     LOG_INFO(UDMF_KITS_NAPI, "init Video %{public}d", status);
+    status = napi_set_named_property(env, exports, "Audio", OHOS::UDMF::AudioNapi::Constructor(env));
+    LOG_INFO(UDMF_KITS_NAPI, "init Audio %{public}d", status);
     status = napi_set_named_property(env, exports, "Folder", OHOS::UDMF::FolderNapi::Constructor(env));
     LOG_INFO(UDMF_KITS_NAPI, "init Folder %{public}d", status);
     status = napi_set_named_property(
@@ -75,7 +78,7 @@ static napi_value Init(napi_env env, napi_value exports)
         env, exports, "SystemDefinedPixelMap", OHOS::UDMF::SystemDefinedPixelMapNapi::Constructor(env));
     LOG_INFO(UDMF_KITS_NAPI, "init SDPixelMap %{public}d", status);
     status = napi_set_named_property(
-            env, exports, "ApplicationDefinedRecord", OHOS::UDMF::ApplicationDefinedRecordNapi::Constructor(env));
+        env, exports, "ApplicationDefinedRecord", OHOS::UDMF::ApplicationDefinedRecordNapi::Constructor(env));
     LOG_INFO(UDMF_KITS_NAPI, "init ApplicationDefinedRecord %{public}d", status);
     return exports;
 }
diff --git a/service/BUILD.gn b/service/BUILD.gn
index 008fb86..e9c193c 100755
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -15,7 +15,7 @@ import("//foundation/distributeddatamgr/udmf/udmf.gni")
 
 config("udmf_service_config") {
   visibility = [ ":*" ]
-  include_dirs = ["include"]
+  include_dirs = [ "include" ]
 }
 
 ohos_shared_library("udmf_server") {
@@ -45,17 +45,17 @@ ohos_shared_library("udmf_server") {
   configs = [ ":udmf_service_config" ]
 
   deps = [
-    "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_client",
-    "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk",
-    "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/framework:distributeddatasvcfwk",
+    "${access_kit_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk",
+    "${ddms_path}/services/distributeddataservice/framework:distributeddatasvcfwk",
+    "../interfaces/innerkits:udmf_client",
   ]
 
   external_deps = [
     "c_utils:utils",
-    "ipc:ipc_core",
-    "multimedia_image_framework:image_native",
     "data_object:distributeddataobject_impl",
     "hiviewdfx_hilog_native:libhilog",
+    "ipc:ipc_core",
+    "multimedia_image_framework:image_native",
   ]
 
   subsystem_name = "distributeddatamgr"
diff --git a/service/src/udmf_service_impl.cpp b/service/src/udmf_service_impl.cpp
index d939f8f..c1f37c1 100755
--- a/service/src/udmf_service_impl.cpp
+++ b/service/src/udmf_service_impl.cpp
@@ -15,8 +15,6 @@
 
 #include "udmf_service_impl.h"
 
-#include <cstdlib>
-
 #include "data_manager.h"
 #include "iservice_registry.h"
 #include "lifecycle/lifecycle_manager.h"
diff --git a/service/src/udmf_service_stub.cpp b/service/src/udmf_service_stub.cpp
index b9b76a8..cc3f3f2 100755
--- a/service/src/udmf_service_stub.cpp
+++ b/service/src/udmf_service_stub.cpp
@@ -67,12 +67,30 @@ int UdmfServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Message
 int32_t UdmfServiceStub::OnSetData(MessageParcel &data, MessageParcel &reply)
 {
     LOG_INFO(UDMF_SERVICE, "start");
-    CustomOption customOption{};
+    CustomOption customOption {};
     UnifiedData unifiedData;
     if (!ITypesUtil::Unmarshal(data, customOption, unifiedData)) {
         LOG_ERROR(UDMF_SERVICE, "Unmarshal option");
         return IPC_STUB_INVALID_DATA_ERR;
     }
+    if (unifiedData.GetRecords().empty()) {
+        LOG_ERROR(UDMF_SERVICE, "Empty data without any record!");
+        return E_INVALID_VALUE;
+    }
+    if (unifiedData.GetRecords().size() > UdmfService::MAX_RECORD_NUM) {
+        LOG_ERROR(UDMF_SERVICE, "Excessive record: %{public}d!", unifiedData.GetRecords().size());
+        return E_INVALID_VALUE;
+    }
+    if (unifiedData.GetSize() > UdmfService::MAX_DATA_SIZE) {
+        LOG_ERROR(UDMF_SERVICE, "Exceeded data limit!");
+        return E_INVALID_VALUE;
+    }
+    for (std::shared_ptr<UnifiedRecord> record : unifiedData.GetRecords()) {
+        if (unifiedData.GetSize() > UdmfService::MAX_RECORD_SIZE) {
+            LOG_ERROR(UDMF_SERVICE, "Exceeded record limit!");
+            return E_INVALID_VALUE;
+        }
+    }
     int32_t token = static_cast<int>(IPCSkeleton::GetCallingTokenID());
     customOption.tokenId = token;
     std::string key;
@@ -175,6 +193,5 @@ bool UdmfServiceStub::VerifyPermission(const std::string &permission)
     return true;
 #endif // UDMF_PERMISSION_ENABLED
 }
-
 } // namespace UDMF
 } // namespace OHOS
diff --git a/udmf.gni b/udmf.gni
index 08e7304..5a0fe58 100644
--- a/udmf.gni
+++ b/udmf.gni
@@ -11,12 +11,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-aafwk_inner_api_path =
-    "//foundation/ability/ability_runtime/interfaces/inner_api"
+third_party_path = "//third_party"
 
-aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits"
+aafwk_path = "//foundation/ability/ability_runtime"
 
-aafwk_service_path = "//foundation/ability/ability_runtime/services"
+aafwk_inner_api_path = "${aafwk_path}/interfaces/inner_api"
+
+aafwk_kits_path = "${aafwk_path}/frameworks/kits"
+
+aafwk_napi_path = "${aafwk_path}/frameworks/js/napi"
+
+aafwk_service_path = "${aafwk_path}/services"
+
+access_kit_path = "//base/security/access_token"
+
+arkui_path = "//foundation/arkui"
+
+ddms_path = "//foundation/distributeddatamgr/datamgr_service"
+
+file_service_path = "//foundation/filemanagement/app_file_service"
 
 udmf_root_path = "//foundation/distributeddatamgr/udmf"
 
-- 
Gitee