diff --git a/BUILD.gn b/BUILD.gn
index 1856b6f3..4ab304bc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/OAT.xml b/OAT.xml
index 3b2e306e..ea613f02 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2021-2022 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.
@@ -14,7 +14,7 @@
      limitations under the License.
 
      Notes:
-     This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun@huawei.com.
+     This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun.
 -->
 <!-- OAT(OSS Audit Tool) configuration guide:
 basedir: Root dir, the basedir + project path is the real source file location.
diff --git a/README.md b/README.md
index 78b8f1ea..b7fda276 100644
--- a/README.md
+++ b/README.md
@@ -280,7 +280,7 @@ You can use the APIs provided in this repository for your application to record
     ```
     audioCapturer->GetBufferSize(bufferLen);
     ```
-9. Read the captured audio data and convert it to a byte stream. Call the read function repeatedly to read data untill you want to stop recording
+9. Read the captured audio data and convert it to a byte stream. Call the read function repeatedly to read data until you want to stop recording
     ```
     // set isBlocking = true/false for blocking/non-blocking read
     bytesRead = audioCapturer->Read(*buffer, bufferLen, isBlocking);
@@ -289,7 +289,7 @@ You can use the APIs provided in this repository for your application to record
         if (bytesRead < 0) {
             break;
         } else if (bytesRead > 0) {
-            fwrite(buffer, size, bytesRead, recFile); // example shows writes the recored data into a file
+            fwrite(buffer, size, bytesRead, recFile); // example shows writes the recorded data into a file
             numBuffersToCapture--;
         }
     }
diff --git a/frameworks/js/napi/audio_capturer/include/audio_capturer_callback_napi.h b/frameworks/js/napi/audio_capturer/include/audio_capturer_callback_napi.h
index 807d5428..6b0b33b0 100644
--- a/frameworks/js/napi/audio_capturer/include/audio_capturer_callback_napi.h
+++ b/frameworks/js/napi/audio_capturer/include/audio_capturer_callback_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_capturer/include/capturer_period_position_callback_napi.h b/frameworks/js/napi/audio_capturer/include/capturer_period_position_callback_napi.h
index e4fa9620..50fcde3c 100644
--- a/frameworks/js/napi/audio_capturer/include/capturer_period_position_callback_napi.h
+++ b/frameworks/js/napi/audio_capturer/include/capturer_period_position_callback_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_capturer/include/capturer_position_callback_napi.h b/frameworks/js/napi/audio_capturer/include/capturer_position_callback_napi.h
index 9d9ec6a4..45340d21 100644
--- a/frameworks/js/napi/audio_capturer/include/capturer_position_callback_napi.h
+++ b/frameworks/js/napi/audio_capturer/include/capturer_position_callback_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_capturer/src/audio_capturer_callback_napi.cpp b/frameworks/js/napi/audio_capturer/src/audio_capturer_callback_napi.cpp
index 3535c65a..6d03a5b5 100644
--- a/frameworks/js/napi/audio_capturer/src/audio_capturer_callback_napi.cpp
+++ b/frameworks/js/napi/audio_capturer/src/audio_capturer_callback_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -78,6 +78,13 @@ void AudioCapturerCallbackNapi::OnJsCallbackStateChange(std::unique_ptr<AudioCap
         MEDIA_ERR_LOG("AudioCapturerCallbackNapi: OnJsCallbackStateChange: No memory");
         return;
     }
+
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("AudioCapturerCallbackNapi: OnJsCallbackStateChange: jsCb.get() is null");
+        delete work;
+        return;
+    }
+
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/audio_capturer/src/audio_capturer_napi.cpp b/frameworks/js/napi/audio_capturer/src/audio_capturer_napi.cpp
index 22fc5037..ef6b0a2d 100644
--- a/frameworks/js/napi/audio_capturer/src/audio_capturer_napi.cpp
+++ b/frameworks/js/napi/audio_capturer/src/audio_capturer_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -36,13 +36,13 @@ std::unique_ptr<AudioParameters> AudioCapturerNapi::sAudioParameters_ = nullptr;
 std::unique_ptr<AudioCapturerOptions> AudioCapturerNapi::sAudioCapturerOptions_ = nullptr;
 
 namespace {
-    const int ARGS_ONE = 1;
-    const int ARGS_TWO = 2;
-    const int ARGS_THREE = 3;
+    constexpr int ARGS_ONE = 1;
+    constexpr int ARGS_TWO = 2;
+    constexpr int ARGS_THREE = 3;
 
-    const int PARAM0 = 0;
-    const int PARAM1 = 1;
-    const int PARAM2 = 2;
+    constexpr int PARAM0 = 0;
+    constexpr int PARAM1 = 1;
+    constexpr int PARAM2 = 2;
 
     constexpr HiLogLabel LABEL = {LOG_CORE, LOG_DOMAIN, "AudioCapturerNapi"};
 
@@ -456,6 +456,21 @@ void AudioCapturerNapi::IsTrueAsyncCallbackComplete(napi_env env, napi_status st
     }
 }
 
+void AudioCapturerNapi::GetBufferSizeAsyncCallbackComplete(napi_env env, napi_status status, void *data)
+{
+    auto asyncContext = static_cast<AudioCapturerAsyncContext*>(data);
+    napi_value valueParam = nullptr;
+
+    if (asyncContext != nullptr) {
+        if (!asyncContext->status) {
+            napi_create_uint32(env, asyncContext->bufferSize, &valueParam);
+        }
+        CommonCallbackRoutine(env, asyncContext, valueParam);
+    } else {
+        HiLog::Error(LABEL, "ERROR: AudioCapturerAsyncContext* is Null!");
+    }
+}
+
 void AudioCapturerNapi::GetIntValueAsyncCallbackComplete(napi_env env, napi_status status, void *data)
 {
     auto asyncContext = static_cast<AudioCapturerAsyncContext*>(data);
@@ -496,6 +511,7 @@ napi_value AudioCapturerNapi::GetCapturerInfo(napi_env env, napi_callback_info i
     GET_PARAMS(env, info, ARGS_ONE);
 
     unique_ptr<AudioCapturerAsyncContext> asyncContext = make_unique<AudioCapturerAsyncContext>();
+    NAPI_ASSERT(env, asyncContext != nullptr, "no memory");
     status = napi_unwrap(env, thisVar, reinterpret_cast<void**>(&asyncContext->objectInfo));
     if (status == napi_ok && asyncContext->objectInfo != nullptr) {
         for (size_t i = PARAM0; i < argc; i++) {
@@ -616,6 +632,7 @@ napi_value AudioCapturerNapi::Start(napi_env env, napi_callback_info info)
     GET_PARAMS(env, info, ARGS_ONE);
 
     unique_ptr<AudioCapturerAsyncContext> asyncContext = make_unique<AudioCapturerAsyncContext>();
+    NAPI_ASSERT(env, asyncContext != nullptr, "no memory");
 
     status = napi_unwrap(env, thisVar, reinterpret_cast<void**>(&asyncContext->objectInfo));
     if (status == napi_ok && asyncContext->objectInfo != nullptr) {
@@ -1138,10 +1155,10 @@ napi_value AudioCapturerNapi::GetBufferSize(napi_env env, napi_callback_info inf
                 size_t bufferSize;
                 context->status = context->objectInfo->audioCapturer_->GetBufferSize(bufferSize);
                 if (context->status == SUCCESS) {
-                    context->intValue = bufferSize;
+                    context->bufferSize = bufferSize;
                 }
             },
-            GetIntValueAsyncCallbackComplete, static_cast<void*>(asyncContext.get()), &asyncContext->work);
+            GetBufferSizeAsyncCallbackComplete, static_cast<void*>(asyncContext.get()), &asyncContext->work);
         if (status != napi_ok) {
             result = nullptr;
         } else {
@@ -1278,5 +1295,5 @@ napi_value AudioCapturerNapi::CreateAudioCapturerWrapper(napi_env env, unique_pt
 
     return result;
 }
-}
-}
+}  // namespace AudioStandard
+}  // namespace OHOS
diff --git a/frameworks/js/napi/audio_capturer/src/audio_parameters_napi.cpp b/frameworks/js/napi/audio_capturer/src/audio_parameters_napi.cpp
index 904615b6..db7d8394 100644
--- a/frameworks/js/napi/audio_capturer/src/audio_parameters_napi.cpp
+++ b/frameworks/js/napi/audio_capturer/src/audio_parameters_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -156,7 +156,7 @@ napi_value AudioParametersNapi::CreateEncodingTypeObject(napi_env env)
             }
         }
     }
-    HiLog::Error(LABEL, "CreateEncodingTypeObject is Failed!");
+    HiLog::Error(LABEL, "CreateEncodingTypeObject is failed!");
     napi_get_undefined(env, &result);
 
     return result;
@@ -410,6 +410,10 @@ napi_value AudioParametersNapi::GetAudioSampleFormat(napi_env env, napi_callback
 
     status = napi_unwrap(env, jsThis, (void **)&audioParametersNapi);
     if (status == napi_ok) {
+        if (!((audioParametersNapi != nullptr) && (audioParametersNapi->audioParameters_ != nullptr))) {
+            HiLog::Error(LABEL, "Get audio sample format fail to napi_unwrap");
+            return jsResult;
+        }
         audioSampleFormat = audioParametersNapi->audioParameters_->format;
         status = napi_create_int32(env, audioSampleFormat, &jsResult);
         if (status == napi_ok) {
@@ -867,7 +871,7 @@ napi_value AudioParametersNapi::SetDeviceType(napi_env env, napi_callback_info i
     napi_get_undefined(env, &jsResult);
 
     status = napi_get_cb_info(env, info, &argc, args, &jsThis, nullptr);
-    if (status != napi_ok || jsThis == nullptr || args[0] == nullptr) {
+    if ((status != napi_ok) || (jsThis == nullptr) || (args[0] == nullptr)) {
         HiLog::Error(LABEL, "set device type fail to napi_get_cb_info");
         return jsResult;
     }
@@ -889,5 +893,5 @@ napi_value AudioParametersNapi::SetDeviceType(napi_env env, napi_callback_info i
 
     return jsResult;
 }
-}
-}
+}  // namespace AudioStandard
+}  // namespace OHOS
diff --git a/frameworks/js/napi/audio_capturer/src/capturer_period_position_callback_napi.cpp b/frameworks/js/napi/audio_capturer/src/capturer_period_position_callback_napi.cpp
index 6090033a..70395c17 100644
--- a/frameworks/js/napi/audio_capturer/src/capturer_period_position_callback_napi.cpp
+++ b/frameworks/js/napi/audio_capturer/src/capturer_period_position_callback_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -47,6 +47,7 @@ void CapturerPeriodPositionCallbackNapi::SaveCallbackReference(const std::string
                          "CapturerPeriodPositionCallbackNapi: creating reference for callback fail");
 
     std::shared_ptr<AutoRef> cb = std::make_shared<AutoRef>(env_, callback);
+    CHECK_AND_RETURN_LOG(cb != nullptr, "No memory");
     if (callbackName == CAPTURER_PERIOD_POSITION_CALLBACK_NAME) {
         capturerPeriodPositionCallback_ = cb;
     } else {
@@ -82,6 +83,13 @@ void CapturerPeriodPositionCallbackNapi::OnJsCapturerPeriodPositionCallback(
         MEDIA_ERR_LOG("CapturerPeriodPositionCallbackNapi: OnJsCapturerPeriodPositionCallback: No memory");
         return;
     }
+
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("CapturerPeriodPositionCallbackNapi: OnJsCapturerPeriodPositionCallback: jsCb.get() is null");
+        delete work;
+        return;
+    }
+
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/audio_capturer/src/capturer_position_callback_napi.cpp b/frameworks/js/napi/audio_capturer/src/capturer_position_callback_napi.cpp
index 4c2be39d..74515c58 100644
--- a/frameworks/js/napi/audio_capturer/src/capturer_position_callback_napi.cpp
+++ b/frameworks/js/napi/audio_capturer/src/capturer_position_callback_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -81,6 +81,11 @@ void CapturerPositionCallbackNapi::OnJsCapturerPositionCallback(std::unique_ptr<
         MEDIA_ERR_LOG("CapturerPositionCallbackNapi: OnJsCapturerPositionCallback: No memory");
         return;
     }
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("CapturerPositionCallbackNapi: OnJsCapturerPositionCallback: jsCb.get() is null");
+        delete work;
+        return;
+    }
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/audio_common/include/audio_common_napi.h b/frameworks/js/napi/audio_common/include/audio_common_napi.h
index 7aafae06..f6e3d608 100644
--- a/frameworks/js/napi/audio_common/include/audio_common_napi.h
+++ b/frameworks/js/napi/audio_common/include/audio_common_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_common/src/audio_common_napi.cpp b/frameworks/js/napi/audio_common/src/audio_common_napi.cpp
index 254eb1d4..9a4a0fbf 100644
--- a/frameworks/js/napi/audio_common/src/audio_common_napi.cpp
+++ b/frameworks/js/napi/audio_common/src/audio_common_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_manager/include/audio_manager_callback_napi.h b/frameworks/js/napi/audio_manager/include/audio_manager_callback_napi.h
index f8171c83..1a83d789 100644
--- a/frameworks/js/napi/audio_manager/include/audio_manager_callback_napi.h
+++ b/frameworks/js/napi/audio_manager/include/audio_manager_callback_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_manager/include/audio_ringermode_callback_napi.h b/frameworks/js/napi/audio_manager/include/audio_ringermode_callback_napi.h
index 087d8932..8ca29318 100644
--- a/frameworks/js/napi/audio_manager/include/audio_ringermode_callback_napi.h
+++ b/frameworks/js/napi/audio_manager/include/audio_ringermode_callback_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_manager/include/audio_volume_key_event_napi.h b/frameworks/js/napi/audio_manager/include/audio_volume_key_event_napi.h
index f3bdbdb2..1b99e5ca 100644
--- a/frameworks/js/napi/audio_manager/include/audio_volume_key_event_napi.h
+++ b/frameworks/js/napi/audio_manager/include/audio_volume_key_event_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -44,7 +44,7 @@ public:
     virtual ~AudioVolumeKeyEventNapi();
 
     /**
-     * @brief OnAudioVolumeKeyEvent will be executed when hard volume key is pressed up/down
+     * @brief OnVolumeKeyEvent will be executed when hard volume key is pressed up/down
      *
      * @param streamType the stream type for which volume must be updated.
      * @param volumeLevel the volume level to be updated.
diff --git a/frameworks/js/napi/audio_manager/src/audio_device_descriptor_napi.cpp b/frameworks/js/napi/audio_manager/src/audio_device_descriptor_napi.cpp
index 86f89309..9912d8dc 100644
--- a/frameworks/js/napi/audio_manager/src/audio_device_descriptor_napi.cpp
+++ b/frameworks/js/napi/audio_manager/src/audio_device_descriptor_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -48,6 +48,7 @@ void AudioDeviceDescriptorNapi::Destructor(napi_env env, void *nativeObject, voi
     if (nativeObject != nullptr) {
         auto obj = static_cast<AudioDeviceDescriptorNapi*>(nativeObject);
         delete obj;
+        obj = nullptr;
     }
 }
 
diff --git a/frameworks/js/napi/audio_manager/src/audio_manager_callback_napi.cpp b/frameworks/js/napi/audio_manager/src/audio_manager_callback_napi.cpp
index 06d3aa5f..c33e3c0f 100644
--- a/frameworks/js/napi/audio_manager/src/audio_manager_callback_napi.cpp
+++ b/frameworks/js/napi/audio_manager/src/audio_manager_callback_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -13,12 +13,13 @@
  * limitations under the License.
  */
 
+#include "audio_manager_callback_napi.h"
+
 #include <uv.h>
 
+#include "audio_device_descriptor_napi.h"
 #include "audio_errors.h"
 #include "media_log.h"
-#include "audio_device_descriptor_napi.h"
-#include "audio_manager_callback_napi.h"
 
 namespace OHOS {
 namespace AudioStandard {
@@ -107,6 +108,13 @@ void AudioManagerCallbackNapi::OnJsCallbackDeviceChange(std::unique_ptr<AudioMan
         MEDIA_ERR_LOG("AudioManagerCallbackNapi: OnJsCallbackDeviceChange: No memory");
         return;
     }
+
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("AudioManagerCallbackNapi: OnJsCallbackDeviceChange: jsCb.get() is null");
+        delete work;
+        return;
+    }
+
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/audio_manager/src/audio_manager_napi.cpp b/frameworks/js/napi/audio_manager/src/audio_manager_napi.cpp
index 22dbe0ac..1f08f309 100644
--- a/frameworks/js/napi/audio_manager/src/audio_manager_napi.cpp
+++ b/frameworks/js/napi/audio_manager/src/audio_manager_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -108,6 +108,7 @@ void AudioManagerNapi::Destructor(napi_env env, void *nativeObject, void *finali
     if (nativeObject != nullptr) {
         auto obj = static_cast<AudioManagerNapi*>(nativeObject);
         delete obj;
+        obj = nullptr;
         MEDIA_DEBUG_LOG("AudioManagerNapi::Destructor delete AudioManagerNapi obj done");
     }
 }
diff --git a/frameworks/js/napi/audio_manager/src/audio_ringermode_callback_napi.cpp b/frameworks/js/napi/audio_manager/src/audio_ringermode_callback_napi.cpp
index 3bc8f6a8..a7c6d67d 100644
--- a/frameworks/js/napi/audio_manager/src/audio_ringermode_callback_napi.cpp
+++ b/frameworks/js/napi/audio_manager/src/audio_ringermode_callback_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -104,6 +104,11 @@ void AudioRingerModeCallbackNapi::OnJsCallbackRingerMode(std::unique_ptr<AudioRi
         MEDIA_ERR_LOG("AudioRingerModeCallbackNapi: OnJsCallbackRingerMode: No memory");
         return;
     }
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("AudioRingerModeCallbackNapi: OnJsCallbackRingerMode: jsCb.get() is null");
+        delete work;
+        return;
+    }
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/audio_manager/src/audio_volume_key_event_napi.cpp b/frameworks/js/napi/audio_manager/src/audio_volume_key_event_napi.cpp
index 0029e9ea..ecbd0e6b 100644
--- a/frameworks/js/napi/audio_manager/src/audio_volume_key_event_napi.cpp
+++ b/frameworks/js/napi/audio_manager/src/audio_volume_key_event_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
+#include "audio_volume_key_event_napi.h"
+
 #include <uv.h>
 
 #include "media_log.h"
 
-#include "audio_volume_key_event_napi.h"
-
 using namespace std;
 namespace {
     const std::string VOLUME_KEY_EVENT_CALLBACK_NAME = "volumeChange";
@@ -135,6 +135,11 @@ void AudioVolumeKeyEventNapi::OnJsCallbackVolumeEvent(std::unique_ptr<AudioVolum
         MEDIA_ERR_LOG("AudioVolumeKeyEventNapi: OnJsCallBackInterrupt: No memory");
         return;
     }
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("AudioVolumeKeyEventNapi: OnJsCallBackInterrupt: jsCb.get() is null");
+        delete work;
+        return;
+    }
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/audio_renderer/include/audio_renderer_callback_napi.h b/frameworks/js/napi/audio_renderer/include/audio_renderer_callback_napi.h
index 3bfc5dd6..ed841b62 100644
--- a/frameworks/js/napi/audio_renderer/include/audio_renderer_callback_napi.h
+++ b/frameworks/js/napi/audio_renderer/include/audio_renderer_callback_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_renderer/include/renderer_period_position_callback_napi.h b/frameworks/js/napi/audio_renderer/include/renderer_period_position_callback_napi.h
index ca6f7822..7e97489e 100644
--- a/frameworks/js/napi/audio_renderer/include/renderer_period_position_callback_napi.h
+++ b/frameworks/js/napi/audio_renderer/include/renderer_period_position_callback_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_renderer/include/renderer_position_callback_napi.h b/frameworks/js/napi/audio_renderer/include/renderer_position_callback_napi.h
index 52468651..d91ab23c 100644
--- a/frameworks/js/napi/audio_renderer/include/renderer_position_callback_napi.h
+++ b/frameworks/js/napi/audio_renderer/include/renderer_position_callback_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/audio_renderer/src/audio_renderer_callback_napi.cpp b/frameworks/js/napi/audio_renderer/src/audio_renderer_callback_napi.cpp
index 6ff9ecd9..2df1044d 100644
--- a/frameworks/js/napi/audio_renderer/src/audio_renderer_callback_napi.cpp
+++ b/frameworks/js/napi/audio_renderer/src/audio_renderer_callback_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -96,6 +96,11 @@ void AudioRendererCallbackNapi::OnJsCallbackInterrupt(std::unique_ptr<AudioRende
         MEDIA_ERR_LOG("AudioRendererCallbackNapi: OnJsCallBackInterrupt: No memory");
         return;
     }
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("AudioRendererCallbackNapi: OnJsCallBackInterrupt: jsCb.get() is null");
+        delete work;
+        return;
+    }
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
@@ -163,6 +168,11 @@ void AudioRendererCallbackNapi::OnJsCallbackStateChange(std::unique_ptr<AudioRen
         MEDIA_ERR_LOG("AudioRendererCallbackNapi: OnJsCallbackStateChange: No memory");
         return;
     }
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("AudioRendererCallbackNapi: OnJsCallbackStateChange: jsCb.get() is null");
+        delete work;
+        return;
+    }
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/audio_renderer/src/audio_renderer_napi.cpp b/frameworks/js/napi/audio_renderer/src/audio_renderer_napi.cpp
index 332ef123..502b848d 100644
--- a/frameworks/js/napi/audio_renderer/src/audio_renderer_napi.cpp
+++ b/frameworks/js/napi/audio_renderer/src/audio_renderer_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -80,6 +80,7 @@ void AudioRendererNapi::Destructor(napi_env env, void *nativeObject, void *final
     if (nativeObject != nullptr) {
         auto obj = static_cast<AudioRendererNapi *>(nativeObject);
         delete obj;
+        obj = nullptr;
     }
 }
 
@@ -559,7 +560,7 @@ void AudioRendererNapi::WriteAsyncCallbackComplete(napi_env env, napi_status sta
 
     if (asyncContext != nullptr) {
         if (!asyncContext->status) {
-            napi_create_int32(env, asyncContext->intValue, &valueParam);
+            napi_create_uint32(env, asyncContext->totalBytesWritten, &valueParam);
         }
         if (!asyncContext->status) {
         napi_get_undefined(env, &result[PARAM0]);
@@ -799,6 +800,21 @@ void AudioRendererNapi::VoidAsyncCallbackComplete(napi_env env, napi_status stat
     }
 }
 
+void AudioRendererNapi::GetBufferSizeAsyncCallbackComplete(napi_env env, napi_status status, void *data)
+{
+    auto asyncContext = static_cast<AudioRendererAsyncContext *>(data);
+    napi_value valueParam = nullptr;
+
+    if (asyncContext != nullptr) {
+        if (!asyncContext->status) {
+            napi_create_uint32(env, asyncContext->bufferSize, &valueParam);
+        }
+        CommonCallbackRoutine(env, asyncContext, valueParam);
+    } else {
+        HiLog::Error(LABEL, "ERROR: AudioRendererAsyncContext* is Null!");
+    }
+}
+
 void AudioRendererNapi::GetIntValueAsyncCallbackComplete(napi_env env, napi_status status, void *data)
 {
     auto asyncContext = static_cast<AudioRendererAsyncContext *>(data);
@@ -1114,17 +1130,20 @@ napi_value AudioRendererNapi::Write(napi_env env, napi_callback_info info)
                 }
 
                 int32_t bytesWritten = 0;
+                size_t totalBytesWritten = 0;
                 size_t minBytes = 4;
-                while ((bytesWritten < bufferLen) && ((bufferLen - bytesWritten) > minBytes)) {
-                    bytesWritten += context->objectInfo->audioRenderer_->Write(buffer.get() + bytesWritten,
-                                                                               bufferLen - bytesWritten);
+                while ((totalBytesWritten < bufferLen) && ((bufferLen - totalBytesWritten) > minBytes)) {
+                    bytesWritten = context->objectInfo->audioRenderer_->Write(buffer.get() + totalBytesWritten,
+                                                                              bufferLen - totalBytesWritten);
                     if (bytesWritten < 0) {
                         break;
                     }
+
+                    totalBytesWritten += bytesWritten;
                 }
 
                 context->status = SUCCESS;
-                context->intValue = bytesWritten;
+                context->totalBytesWritten = totalBytesWritten;
             },
             WriteAsyncCallbackComplete, static_cast<void *>(asyncContext.get()), &asyncContext->work);
         if (status != napi_ok) {
@@ -1480,10 +1499,10 @@ napi_value AudioRendererNapi::GetBufferSize(napi_env env, napi_callback_info inf
                 size_t bufferSize;
                 context->status = context->objectInfo->audioRenderer_->GetBufferSize(bufferSize);
                 if (context->status == SUCCESS) {
-                    context->intValue = bufferSize;
+                    context->bufferSize = bufferSize;
                 }
             },
-            GetIntValueAsyncCallbackComplete, static_cast<void *>(asyncContext.get()), &asyncContext->work);
+            GetBufferSizeAsyncCallbackComplete, static_cast<void *>(asyncContext.get()), &asyncContext->work);
         if (status != napi_ok) {
             result = nullptr;
         } else {
diff --git a/frameworks/js/napi/audio_renderer/src/renderer_period_position_callback_napi.cpp b/frameworks/js/napi/audio_renderer/src/renderer_period_position_callback_napi.cpp
index 227fb2b5..0ee9437a 100644
--- a/frameworks/js/napi/audio_renderer/src/renderer_period_position_callback_napi.cpp
+++ b/frameworks/js/napi/audio_renderer/src/renderer_period_position_callback_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -82,6 +82,11 @@ void RendererPeriodPositionCallbackNapi::OnJsRendererPeriodPositionCallback(
         MEDIA_ERR_LOG("RendererPeriodPositionCallbackNapi: OnJsRendererPeriodPositionCallback: No memory");
         return;
     }
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("RendererPeriodPositionCallbackNapi: OnJsRendererPeriodPositionCallback: jsCb.get() is null");
+        delete work;
+        return;
+    }
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/audio_renderer/src/renderer_position_callback_napi.cpp b/frameworks/js/napi/audio_renderer/src/renderer_position_callback_napi.cpp
index 51a16514..4e584091 100644
--- a/frameworks/js/napi/audio_renderer/src/renderer_position_callback_napi.cpp
+++ b/frameworks/js/napi/audio_renderer/src/renderer_position_callback_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -81,6 +81,11 @@ void RendererPositionCallbackNapi::OnJsRendererPositionCallback(std::unique_ptr<
         MEDIA_ERR_LOG("RendererPositionCallbackNapi: OnJsRendererPositionCallback: No memory");
         return;
     }
+    if (jsCb.get() == nullptr) {
+        MEDIA_ERR_LOG("RendererPositionCallbackNapi: OnJsRendererPositionCallback: jsCb.get() is null");
+        delete work;
+        return;
+    }
     work->data = reinterpret_cast<void *>(jsCb.get());
 
     int ret = uv_queue_work(loop, work, [] (uv_work_t *work) {}, [] (uv_work_t *work, int status) {
diff --git a/frameworks/js/napi/ringtone_manager/src/audio_renderer_info_napi.cpp b/frameworks/js/napi/ringtone_manager/src/audio_renderer_info_napi.cpp
index a3c38238..cc4030ce 100644
--- a/frameworks/js/napi/ringtone_manager/src/audio_renderer_info_napi.cpp
+++ b/frameworks/js/napi/ringtone_manager/src/audio_renderer_info_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -45,6 +45,7 @@ void AudioRendererInfoNapi::Destructor(napi_env env, void *nativeObject, void *f
     if (nativeObject != nullptr) {
         auto obj = static_cast<AudioRendererInfoNapi *>(nativeObject);
         delete obj;
+        obj = nullptr;
     }
 }
 
@@ -240,12 +241,15 @@ napi_value AudioRendererInfoNapi::SetStreamUsage(napi_env env, napi_callback_inf
     }
 
     status = napi_unwrap(env, jsThis, (void **)&audioRendererInfoNapi);
-    if (status == napi_ok) {
-        napi_valuetype valueType = napi_undefined;
-        if (napi_typeof(env, args[0], &valueType) != napi_ok || valueType != napi_number) {
-            HiLog::Error(LABEL, "set stream usage fail: wrong data type");
-            return jsResult;
-        }
+    if (status != napi_ok) {
+        HiLog::Error(LABEL, "Napi unwrap failed");
+        return jsResult;
+    }
+
+    napi_valuetype valueType = napi_undefined;
+    if (napi_typeof(env, args[0], &valueType) != napi_ok || valueType != napi_number) {
+        HiLog::Error(LABEL, "set stream usage fail: wrong data type");
+        return jsResult;
     }
 
     status = napi_get_value_int32(env, args[0], &usage);
diff --git a/frameworks/js/napi/ringtone_manager/src/ringtone_options_napi.cpp b/frameworks/js/napi/ringtone_manager/src/ringtone_options_napi.cpp
index 8f9befab..f2ee3881 100644
--- a/frameworks/js/napi/ringtone_manager/src/ringtone_options_napi.cpp
+++ b/frameworks/js/napi/ringtone_manager/src/ringtone_options_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -47,6 +47,7 @@ void RingtoneOptionsNapi::Destructor(napi_env env, void *nativeObject, void *fin
     if (nativeObject != nullptr) {
         auto obj = static_cast<RingtoneOptionsNapi *>(nativeObject);
         delete obj;
+        obj = nullptr;
     }
 }
 
diff --git a/frameworks/js/napi/ringtone_manager/src/ringtone_player_napi.cpp b/frameworks/js/napi/ringtone_manager/src/ringtone_player_napi.cpp
index 099da557..92235274 100644
--- a/frameworks/js/napi/ringtone_manager/src/ringtone_player_napi.cpp
+++ b/frameworks/js/napi/ringtone_manager/src/ringtone_player_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/js/napi/ringtone_manager/src/system_sound_manager_napi.cpp b/frameworks/js/napi/ringtone_manager/src/system_sound_manager_napi.cpp
index 64638d18..51b62362 100644
--- a/frameworks/js/napi/ringtone_manager/src/system_sound_manager_napi.cpp
+++ b/frameworks/js/napi/ringtone_manager/src/system_sound_manager_napi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audioadapter/BUILD.gn b/frameworks/native/audioadapter/BUILD.gn
index e5a6e1ea..351da694 100644
--- a/frameworks/native/audioadapter/BUILD.gn
+++ b/frameworks/native/audioadapter/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audioadapter/include/audio_service_adapter.h b/frameworks/native/audioadapter/include/audio_service_adapter.h
index 0db34fa6..86fb5d00 100644
--- a/frameworks/native/audioadapter/include/audio_service_adapter.h
+++ b/frameworks/native/audioadapter/include/audio_service_adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -63,7 +63,7 @@ public:
      *
      * @param audioPortName name of the audio modules to be loaded
      * @param moduleArgs audio module info like rate, channel etc
-     * @return Returns module index if module loaded sucessfully; returns an error code
+     * @return Returns module index if module loaded successfully; returns an error code
      * defined in {@link audio_errors.h} otherwise.
      */
     virtual uint32_t OpenAudioPort(std::string audioPortName, std::string moduleArgs) = 0;
diff --git a/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h b/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h
index 35e19e33..97739e15 100644
--- a/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h
+++ b/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp b/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp
index f1f4926e..796bfc90 100644
--- a/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp
+++ b/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -16,12 +16,13 @@
 #ifndef ST_PULSEAUDIO_AUDIO_SERVICE_ADAPTER_IMPL_H
 #define ST_PULSEAUDIO_AUDIO_SERVICE_ADAPTER_IMPL_H
 
+#include "pulse_audio_service_adapter_impl.h"
+
 #include <sstream>
 #include <unistd.h>
 
 #include "audio_errors.h"
 #include "media_log.h"
-#include "pulse_audio_service_adapter_impl.h"
 
 using namespace std;
 
@@ -62,10 +63,11 @@ bool PulseAudioServiceAdapterImpl::Connect()
     while (true) {
         pa_context_state_t state;
 
-        if (mContext != NULL) {
+        if (mContext != nullptr) {
             state = pa_context_get_state(mContext);
-            if (state == PA_CONTEXT_READY)
+            if (state == PA_CONTEXT_READY) {
                 break;
+            }
             // if pulseaudio is ready, retry connect to pulseaudio. before retry wait for sometime. reduce sleep later
             usleep(PA_CONNECT_RETRY_SLEEP_IN_MICRO_SECONDS);
         }
@@ -89,28 +91,33 @@ bool PulseAudioServiceAdapterImpl::Connect()
 bool PulseAudioServiceAdapterImpl::ConnectToPulseAudio()
 {
     unique_ptr<UserData> userData = make_unique<UserData>();
+    if (userData == nullptr) {
+        MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] UserData memory alloc failed");
+        return false;
+    }
+
     userData->thiz = this;
 
-    if (mContext != NULL) {
+    if (mContext != nullptr) {
         pa_context_disconnect(mContext);
-        pa_context_set_state_callback(mContext, NULL, NULL);
-        pa_context_set_subscribe_callback(mContext, NULL, NULL);
+        pa_context_set_state_callback(mContext, nullptr, nullptr);
+        pa_context_set_subscribe_callback(mContext, nullptr, nullptr);
         pa_context_unref(mContext);
     }
 
     pa_proplist *proplist = pa_proplist_new();
     pa_proplist_sets(proplist, PA_PROP_APPLICATION_NAME, "PulseAudio Service");
     pa_proplist_sets(proplist, PA_PROP_APPLICATION_ID, "com.ohos.pulseaudio.service");
-    mContext = pa_context_new_with_proplist(pa_threaded_mainloop_get_api(mMainLoop), NULL, proplist);
+    mContext = pa_context_new_with_proplist(pa_threaded_mainloop_get_api(mMainLoop), nullptr, proplist);
     pa_proplist_free(proplist);
 
-    if (mContext == NULL) {
+    if (mContext == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] creating pa context failed");
         return false;
     }
 
     pa_context_set_state_callback(mContext,  PulseAudioServiceAdapterImpl::PaContextStateCb, this);
-    if (pa_context_connect(mContext, NULL, PA_CONTEXT_NOFAIL, NULL) < 0) {
+    if (pa_context_connect(mContext, nullptr, PA_CONTEXT_NOFAIL, nullptr) < 0) {
         if (pa_context_errno(mContext) == PA_ERR_INVALID) {
             MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa context connect failed: %{public}s",
                 pa_strerror(pa_context_errno(mContext)));
@@ -122,8 +129,8 @@ bool PulseAudioServiceAdapterImpl::ConnectToPulseAudio()
 
 Fail:
     /* Make sure we don't get any further callbacks */
-    pa_context_set_state_callback(mContext, NULL, NULL);
-    pa_context_set_subscribe_callback(mContext, NULL, NULL);
+    pa_context_set_state_callback(mContext, nullptr, nullptr);
+    pa_context_set_subscribe_callback(mContext, nullptr, nullptr);
     pa_context_unref(mContext);
     return false;
 }
@@ -136,7 +143,7 @@ uint32_t PulseAudioServiceAdapterImpl::OpenAudioPort(string audioPortName, strin
     pa_threaded_mainloop_lock(mMainLoop);
     pa_operation *operation = pa_context_load_module(mContext, audioPortName.c_str(), moduleArgs.c_str(),
         PaModuleLoadCb, reinterpret_cast<void*>(userData.get()));
-    if (operation == NULL) {
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_load_module returned nullptr");
         pa_threaded_mainloop_unlock(mMainLoop);
         return ERR_INVALID_HANDLE;
@@ -161,8 +168,8 @@ int32_t PulseAudioServiceAdapterImpl::CloseAudioPort(int32_t audioHandleIndex)
 {
     pa_threaded_mainloop_lock(mMainLoop);
 
-    pa_operation *operation = pa_context_unload_module(mContext, audioHandleIndex, NULL, NULL);
-    if (operation == NULL) {
+    pa_operation *operation = pa_context_unload_module(mContext, audioHandleIndex, nullptr, nullptr);
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_unload_module returned nullptr!");
         pa_threaded_mainloop_unlock(mMainLoop);
         return ERROR;
@@ -179,8 +186,9 @@ int32_t PulseAudioServiceAdapterImpl::SuspendAudioDevice(string &audioPortName,
     pa_threaded_mainloop_lock(mMainLoop);
 
     auto suspendFlag = isSuspend ? 1 : 0;
-    pa_operation *operation = pa_context_suspend_sink_by_name(mContext, audioPortName.c_str(), suspendFlag, NULL, NULL);
-    if (operation == NULL) {
+    pa_operation *operation = pa_context_suspend_sink_by_name(mContext, audioPortName.c_str(), suspendFlag,
+        nullptr, nullptr);
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_suspend_sink_by_name failed!");
         pa_threaded_mainloop_unlock(mMainLoop);
         return ERR_OPERATION_FAILED;
@@ -195,8 +203,8 @@ int32_t PulseAudioServiceAdapterImpl::SuspendAudioDevice(string &audioPortName,
 int32_t PulseAudioServiceAdapterImpl::SetDefaultSink(string name)
 {
     pa_threaded_mainloop_lock(mMainLoop);
-    pa_operation *operation = pa_context_set_default_sink(mContext, name.c_str(), NULL, NULL);
-    if (operation == NULL) {
+    pa_operation *operation = pa_context_set_default_sink(mContext, name.c_str(), nullptr, nullptr);
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_set_default_sink failed!");
         pa_threaded_mainloop_unlock(mMainLoop);
         return ERR_OPERATION_FAILED;
@@ -210,8 +218,8 @@ int32_t PulseAudioServiceAdapterImpl::SetDefaultSink(string name)
 int32_t PulseAudioServiceAdapterImpl::SetDefaultSource(string name)
 {
     pa_threaded_mainloop_lock(mMainLoop);
-    pa_operation *operation = pa_context_set_default_source(mContext, name.c_str(), NULL, NULL);
-    if (operation == NULL) {
+    pa_operation *operation = pa_context_set_default_source(mContext, name.c_str(), nullptr, nullptr);
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_set_default_source failed!");
         pa_threaded_mainloop_unlock(mMainLoop);
         return ERR_OPERATION_FAILED;
@@ -225,18 +233,23 @@ int32_t PulseAudioServiceAdapterImpl::SetDefaultSource(string name)
 int32_t PulseAudioServiceAdapterImpl::SetVolume(AudioStreamType streamType, float volume)
 {
     unique_ptr<UserData> userData = make_unique<UserData>();
+    if (userData == nullptr) {
+        MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] SetVolume UserData memory alloc failed");
+        return ERROR;
+    }
+
     userData->thiz = this;
     userData->volume = volume;
     userData->streamType = streamType;
 
-    if (mContext == NULL) {
+    if (mContext == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] SetVolume mContext is nullptr");
         return ERROR;
     }
     pa_threaded_mainloop_lock(mMainLoop);
     pa_operation *operation = pa_context_get_sink_input_info_list(mContext,
         PulseAudioServiceAdapterImpl::PaGetSinkInputInfoVolumeCb, reinterpret_cast<void*>(userData.get()));
-    if (operation == NULL) {
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_get_sink_input_info_list nullptr");
         pa_threaded_mainloop_unlock(mMainLoop);
         return ERROR;
@@ -258,7 +271,7 @@ int32_t PulseAudioServiceAdapterImpl::SetMute(AudioStreamType streamType, bool m
     userData->mute = mute;
     userData->streamType = streamType;
 
-    if (mContext == NULL) {
+    if (mContext == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] SetMute mContext is nullptr");
         return ERROR;
     }
@@ -266,7 +279,7 @@ int32_t PulseAudioServiceAdapterImpl::SetMute(AudioStreamType streamType, bool m
 
     pa_operation *operation = pa_context_get_sink_input_info_list(mContext,
         PulseAudioServiceAdapterImpl::PaGetSinkInputInfoMuteCb, reinterpret_cast<void*>(userData.get()));
-    if (operation == NULL) {
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_get_sink_input_info_list returned nullptr");
         pa_threaded_mainloop_unlock(mMainLoop);
         return ERROR;
@@ -289,7 +302,7 @@ bool PulseAudioServiceAdapterImpl::IsMute(AudioStreamType streamType)
     userData->streamType = streamType;
     userData->mute = false;
 
-    if (mContext == NULL) {
+    if (mContext == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] IsMute mContext is nullptr");
         return false;
     }
@@ -298,7 +311,7 @@ bool PulseAudioServiceAdapterImpl::IsMute(AudioStreamType streamType)
 
     pa_operation *operation = pa_context_get_sink_input_info_list(mContext,
         PulseAudioServiceAdapterImpl::PaGetSinkInputInfoMuteStatusCb, reinterpret_cast<void*>(userData.get()));
-    if (operation == NULL) {
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_get_sink_input_info_list returned nullptr");
         pa_threaded_mainloop_unlock(mMainLoop);
         return false;
@@ -321,7 +334,7 @@ bool PulseAudioServiceAdapterImpl::IsStreamActive(AudioStreamType streamType)
     userData->streamType = streamType;
     userData->isCorked = true;
 
-    if (mContext == NULL) {
+    if (mContext == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] IsStreamActive mContext is nullptr");
         return false;
     }
@@ -330,7 +343,7 @@ bool PulseAudioServiceAdapterImpl::IsStreamActive(AudioStreamType streamType)
 
     pa_operation *operation = pa_context_get_sink_input_info_list(mContext,
         PulseAudioServiceAdapterImpl::PaGetSinkInputInfoCorkStatusCb, reinterpret_cast<void*>(userData.get()));
-    if (operation == NULL) {
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("[IsStreamActive] pa_context_get_sink_input_info_list returned nullptr");
         pa_threaded_mainloop_unlock(mMainLoop);
         return false;
@@ -351,20 +364,18 @@ bool PulseAudioServiceAdapterImpl::IsStreamActive(AudioStreamType streamType)
 
 void PulseAudioServiceAdapterImpl::Disconnect()
 {
-    if (mContext != NULL) {
+    if (mContext != nullptr) {
         pa_context_disconnect(mContext);
         /* Make sure we don't get any further callbacks */
-        pa_context_set_state_callback(mContext, NULL, NULL);
-        pa_context_set_subscribe_callback(mContext, NULL, NULL);
+        pa_context_set_state_callback(mContext, nullptr, nullptr);
+        pa_context_set_subscribe_callback(mContext, nullptr, nullptr);
         pa_context_unref(mContext);
     }
 
-    if (mMainLoop != NULL) {
+    if (mMainLoop != nullptr) {
         pa_threaded_mainloop_stop(mMainLoop);
         pa_threaded_mainloop_free(mMainLoop);
     }
-
-    return;
 }
 
 string PulseAudioServiceAdapterImpl::GetNameByStreamType(AudioStreamType streamType)
@@ -433,13 +444,13 @@ void PulseAudioServiceAdapterImpl::PaGetSinkInputInfoMuteStatusCb(pa_context *c,
         return;
     }
 
-    if (i->proplist == NULL) {
+    if (i->proplist == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] Invalid Proplist for sink input (%{public}d).", i->index);
         return;
     }
 
     const char *streamtype = pa_proplist_gets(i->proplist, "stream.type");
-    if (streamtype == NULL) {
+    if (streamtype == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] Invalid StreamType.");
         return;
     }
@@ -471,20 +482,20 @@ void PulseAudioServiceAdapterImpl::PaGetSinkInputInfoMuteCb(pa_context *c, const
         return;
     }
 
-    if (i->proplist == NULL) {
+    if (i->proplist == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] Invalid Proplist for sink input (%{public}d).", i->index);
         return;
     }
 
     const char *streamtype = pa_proplist_gets(i->proplist, "stream.type");
-    if (streamtype == NULL) {
+    if (streamtype == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] Invalid StreamType.");
         return;
     }
 
     string streamType(streamtype);
     if (!streamType.compare(thiz->GetNameByStreamType(userData->streamType))) {
-        pa_operation_unref(pa_context_set_sink_input_mute(c, i->index, (userData->mute) ? 1 : 0, NULL, NULL));
+        pa_operation_unref(pa_context_set_sink_input_mute(c, i->index, (userData->mute) ? 1 : 0, nullptr, nullptr));
         MEDIA_INFO_LOG("[PulseAudioServiceAdapterImpl] Applied Mute : %{public}d for stream : %{public}s",
             userData->mute, i->name);
     }
@@ -509,8 +520,8 @@ void PulseAudioServiceAdapterImpl::PaContextStateCb(pa_context *c, void *userdat
             pa_operation *operation = pa_context_subscribe(c, (pa_subscription_mask_t)
                 (PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE |
                 PA_SUBSCRIPTION_MASK_SINK_INPUT | PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT |
-                PA_SUBSCRIPTION_MASK_CARD), NULL, NULL);
-            if (operation == NULL) {
+                PA_SUBSCRIPTION_MASK_CARD), nullptr, nullptr);
+            if (operation == nullptr) {
                 pa_threaded_mainloop_signal(thiz->mMainLoop, 0);
                 return;
             }
@@ -563,7 +574,7 @@ void PulseAudioServiceAdapterImpl::PaGetSinkInputInfoVolumeCb(pa_context *c, con
         return;
     }
 
-    if (i->proplist == NULL) {
+    if (i->proplist == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] Invalid Proplist for sink input (%{public}d).", i->index);
         return;
     }
@@ -571,7 +582,7 @@ void PulseAudioServiceAdapterImpl::PaGetSinkInputInfoVolumeCb(pa_context *c, con
     const char *streamtype = pa_proplist_gets(i->proplist, "stream.type");
     const char *streamVolume = pa_proplist_gets(i->proplist, "stream.volumeFactor");
     const char *sessionCStr = pa_proplist_gets(i->proplist, "stream.sessionID");
-    if ((streamtype == NULL) || (streamVolume == NULL) || (sessionCStr == NULL)) {
+    if ((streamtype == nullptr) || (streamVolume == nullptr) || (sessionCStr == nullptr)) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] Invalid StreamType or streamVolume or SessionID");
         return;
     }
@@ -593,17 +604,15 @@ void PulseAudioServiceAdapterImpl::PaGetSinkInputInfoVolumeCb(pa_context *c, con
     pa_cvolume cv = i->volume;
     uint32_t volume = pa_sw_volume_from_linear(vol);
     pa_cvolume_set(&cv, i->channel_map.channels, volume);
-    pa_operation_unref(pa_context_set_sink_input_volume(c, i->index, &cv, NULL, NULL));
+    pa_operation_unref(pa_context_set_sink_input_volume(c, i->index, &cv, nullptr, nullptr));
 
     if (streamID == userData->streamType) {
         if (i->mute) {
-            pa_operation_unref(pa_context_set_sink_input_mute(c, i->index, 0, NULL, NULL));
+            pa_operation_unref(pa_context_set_sink_input_mute(c, i->index, 0, nullptr, nullptr));
         }
     }
     MEDIA_INFO_LOG("[PulseAudioServiceAdapterImpl]volume : %{public}f for stream : %{public}s, volumeInt%{public}d",
         vol, i->name, volume);
-
-    return;
 }
 
 void PulseAudioServiceAdapterImpl::PaGetSinkInputInfoCorkStatusCb(pa_context *c, const pa_sink_input_info *i, int eol,
@@ -623,13 +632,13 @@ void PulseAudioServiceAdapterImpl::PaGetSinkInputInfoCorkStatusCb(pa_context *c,
         return;
     }
 
-    if (i->proplist == NULL) {
+    if (i->proplist == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] Invalid Proplist for sink input (%{public}d).", i->index);
         return;
     }
 
     const char *streamtype = pa_proplist_gets(i->proplist, "stream.type");
-    if (streamtype == NULL) {
+    if (streamtype == nullptr) {
         MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] Invalid StreamType.");
         return;
     }
@@ -640,8 +649,6 @@ void PulseAudioServiceAdapterImpl::PaGetSinkInputInfoCorkStatusCb(pa_context *c,
         MEDIA_INFO_LOG("[PulseAudioServiceAdapterImpl] corked : %{public}d for stream : %{public}s",
             userData->isCorked, i->name);
     }
-
-    return;
 }
 
 void PulseAudioServiceAdapterImpl::PaSubscribeCb(pa_context *c, pa_subscription_event_type_t t, uint32_t idx,
@@ -662,7 +669,7 @@ void PulseAudioServiceAdapterImpl::PaSubscribeCb(pa_context *c, pa_subscription_
                 pa_threaded_mainloop_lock(thiz->mMainLoop);
                 pa_operation *operation = pa_context_get_sink_input_info(c, idx,
                     PulseAudioServiceAdapterImpl::PaGetSinkInputInfoVolumeCb, reinterpret_cast<void*>(userData.get()));
-                if (operation == NULL) {
+                if (operation == nullptr) {
                     MEDIA_ERR_LOG("[PulseAudioServiceAdapterImpl] pa_context_get_sink_input_info_list nullptr");
                     pa_threaded_mainloop_unlock(thiz->mMainLoop);
                     return;
@@ -684,8 +691,6 @@ void PulseAudioServiceAdapterImpl::PaSubscribeCb(pa_context *c, pa_subscription_
         default:
             break;
     }
-
-    return;
 }
 } // namespace AudioStandard
 } // namespace OHOS
diff --git a/frameworks/native/audiocapturer/BUILD.gn b/frameworks/native/audiocapturer/BUILD.gn
index e2ffb12a..61f91411 100644
--- a/frameworks/native/audiocapturer/BUILD.gn
+++ b/frameworks/native/audiocapturer/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
@@ -19,8 +19,8 @@ ohos_shared_library("audio_capturer_source") {
   sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/src/audio_capturer_source.cpp" ]
   cflags = [ "-fPIC" ]
   cflags += [ "-Wall" ]
-  if (device_name == "baltimore") {
-    cflags += [ "-DDEVICE_BALTIMORE" ]
+  if ("${product_name}" == "m40") {
+    cflags += [ "-DPRODUCT_M40" ]
   }
   cflags_cc = cflags
 
@@ -45,7 +45,7 @@ ohos_shared_library("audio_capturer_source") {
     "//third_party/bounds_checking_function:libsec_static",
   ]
 
-  if (device_name == "baltimore") {
+  if ("${product_name}" == "m40") {
     deps += [ "//drivers/peripheral/adapter/audio/interfaces:hdi_audio_client" ]
   } else {
     deps +=
diff --git a/frameworks/native/audiocapturer/include/audio_capturer_private.h b/frameworks/native/audiocapturer/include/audio_capturer_private.h
index d00d927f..3db86515 100644
--- a/frameworks/native/audiocapturer/include/audio_capturer_private.h
+++ b/frameworks/native/audiocapturer/include/audio_capturer_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiocapturer/include/audio_capturer_source.h b/frameworks/native/audiocapturer/include/audio_capturer_source.h
index 3103269d..92a16cfe 100644
--- a/frameworks/native/audiocapturer/include/audio_capturer_source.h
+++ b/frameworks/native/audiocapturer/include/audio_capturer_source.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiocapturer/include/audio_capturer_source_intf.h b/frameworks/native/audiocapturer/include/audio_capturer_source_intf.h
index e4ced168..5e2cab13 100644
--- a/frameworks/native/audiocapturer/include/audio_capturer_source_intf.h
+++ b/frameworks/native/audiocapturer/include/audio_capturer_source_intf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp
index 32bb9ab5..26b449e3 100644
--- a/frameworks/native/audiocapturer/src/audio_capturer.cpp
+++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiocapturer/src/audio_capturer_source.cpp b/frameworks/native/audiocapturer/src/audio_capturer_source.cpp
index 8513c81c..163cc1bd 100644
--- a/frameworks/native/audiocapturer/src/audio_capturer_source.cpp
+++ b/frameworks/native/audiocapturer/src/audio_capturer_source.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -78,7 +78,7 @@ void AudioCapturerSource::DeInit()
 #endif // CAPTURE_DUMP
 }
 
-int32_t InitAttrsCapture(struct AudioSampleAttributes &attrs)
+void InitAttrsCapture(struct AudioSampleAttributes &attrs)
 {
     /* Initialization of audio parameters for playback */
     attrs.format = AUDIO_FORMAT_PCM_16_BIT;
@@ -95,12 +95,10 @@ int32_t InitAttrsCapture(struct AudioSampleAttributes &attrs)
     attrs.stopThreshold = INT_32_MAX;
     /* 16 * 1024 */
     attrs.silenceThreshold = AUDIO_BUFF_SIZE;
-
-    return SUCCESS;
 }
 
-int32_t SwitchAdapterCapture(struct AudioAdapterDescriptor *descs, string adapterNameCase,
-    enum AudioPortDirection portFlag, struct AudioPort &capturePort, const int32_t size)
+int32_t SwitchAdapterCapture(struct AudioAdapterDescriptor *descs, int32_t size, const std::string &adapterNameCase,
+    enum AudioPortDirection portFlag, struct AudioPort &capturePort)
 {
     if (descs == nullptr) {
         return ERROR;
@@ -111,7 +109,7 @@ int32_t SwitchAdapterCapture(struct AudioAdapterDescriptor *descs, string adapte
         if (desc == nullptr) {
             continue;
         }
-        if (!strcmp(desc->adapterName, adapterNameCase.c_str())) {
+        if (!adapterNameCase.compare(desc->adapterName)) {
             for (uint32_t port = 0; port < desc->portNum; port++) {
                 // Only find out the port of out in the sound card
                 if (desc->ports[port].dir == portFlag) {
@@ -121,7 +119,7 @@ int32_t SwitchAdapterCapture(struct AudioAdapterDescriptor *descs, string adapte
             }
         }
     }
-    MEDIA_ERR_LOG("SwitchAdapter Fail");
+    MEDIA_ERR_LOG("SwitchAdapterCapture Fail");
 
     return ERR_INVALID_INDEX;
 }
@@ -188,9 +186,9 @@ int32_t AudioCapturerSource::Init(AudioSourceAttr &attr)
 
     // Get qualified sound card and port
     string adapterNameCase = "internal";
-    index = SwitchAdapterCapture(descs, adapterNameCase, PORT_IN, audioPort, size);
+    index = SwitchAdapterCapture(descs, size, adapterNameCase, PORT_IN, audioPort);
     if (index < 0) {
-        MEDIA_ERR_LOG("Switch Adapter Fail");
+        MEDIA_ERR_LOG("Switch Adapter Capture Fail");
         return ERR_NOT_STARTED;
     }
 
@@ -204,7 +202,7 @@ int32_t AudioCapturerSource::Init(AudioSourceAttr &attr)
         return ERR_NOT_STARTED;
     }
 
-    // Inittialization port information, can fill through mode and other paramters
+    // Inittialization port information, can fill through mode and other parameters
     ret = audioAdapter_->InitAllPorts(audioAdapter_);
     if (ret != 0) {
         MEDIA_ERR_LOG("InitAllPorts failed");
@@ -216,7 +214,7 @@ int32_t AudioCapturerSource::Init(AudioSourceAttr &attr)
         return ERR_NOT_STARTED;
     }
 
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     ret = OpenInput(DEVICE_TYPE_MIC);
     if (ret < 0) {
         MEDIA_ERR_LOG("AudioRendererSink: update route FAILED: %{public}d", ret);
@@ -341,7 +339,7 @@ int32_t AudioCapturerSource::GetMute(bool &isMute)
     return SUCCESS;
 }
 
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
 static AudioCategory GetAudioCategory(AudioScene audioScene)
 {
     AudioCategory audioCategory;
@@ -440,7 +438,7 @@ int32_t AudioCapturerSource::SetAudioScene(AudioScene audioScene)
         return ERR_INVALID_HANDLE;
     }
 
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     int32_t ret = OpenInput(DEVICE_TYPE_MIC);
     if (ret < 0) {
         MEDIA_ERR_LOG("AudioCapturerSource: Update route FAILED: %{public}d", ret);
@@ -449,8 +447,8 @@ int32_t AudioCapturerSource::SetAudioScene(AudioScene audioScene)
     struct AudioSceneDescriptor scene;
     scene.scene.id = GetAudioCategory(audioScene);
     scene.desc.pins = PIN_IN_MIC;
-    if (audioCapture_->scene.SelectScene == NULL) {
-        MEDIA_ERR_LOG("AudioCapturerSource: Select scene NULL");
+    if (audioCapture_->scene.SelectScene == nullptr) {
+        MEDIA_ERR_LOG("AudioCapturerSource: Select scene nullptr");
         return ERR_OPERATION_FAILED;
     }
 
diff --git a/frameworks/native/audiopolicy/BUILD.gn b/frameworks/native/audiopolicy/BUILD.gn
index ab91fe1e..2424dab5 100644
--- a/frameworks/native/audiopolicy/BUILD.gn
+++ b/frameworks/native/audiopolicy/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiopolicy/include/audio_interrupt_callback.h b/frameworks/native/audiopolicy/include/audio_interrupt_callback.h
index 31cbbade..6fb9634f 100644
--- a/frameworks/native/audiopolicy/include/audio_interrupt_callback.h
+++ b/frameworks/native/audiopolicy/include/audio_interrupt_callback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiopolicy/include/audio_policy_manager.h b/frameworks/native/audiopolicy/include/audio_policy_manager.h
index 0c5011f9..3d9c7280 100644
--- a/frameworks/native/audiopolicy/include/audio_policy_manager.h
+++ b/frameworks/native/audiopolicy/include/audio_policy_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/BUILD.gn b/frameworks/native/audiorenderer/BUILD.gn
index 450155fc..ac51b8bb 100644
--- a/frameworks/native/audiorenderer/BUILD.gn
+++ b/frameworks/native/audiorenderer/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
@@ -22,8 +22,8 @@ ohos_shared_library("audio_renderer_sink") {
 
   cflags = [ "-fPIC" ]
   cflags += [ "-Wall" ]
-  if (device_name == "baltimore") {
-    cflags += [ "-DDEVICE_BALTIMORE" ]
+  if ("${product_name}" == "m40") {
+    cflags += [ "-DPRODUCT_M40" ]
   }
   cflags_cc = cflags
 
@@ -50,7 +50,7 @@ ohos_shared_library("audio_renderer_sink") {
     "//utils/native/base:utils",
   ]
 
-  if (device_name == "baltimore") {
+  if ("${product_name}" == "m40") {
     deps += [ "//drivers/peripheral/adapter/audio/interfaces:hdi_audio_client" ]
   } else {
     deps +=
@@ -68,11 +68,7 @@ ohos_shared_library("bluetooth_renderer_sink") {
 
   cflags = [ "-fPIC" ]
   cflags += [ "-Wall" ]
-  if (device_name == "baltimore") {
-    cflags += [ "-DDEVICE_BALTIMORE" ]
-  } else if (device_name == "rk3566" || device_name == "rk3568") {
-    cflags += [ "-DDEVICE_RK" ]
-  }
+
   cflags_cc = cflags
 
   include_dirs = [
@@ -101,6 +97,53 @@ ohos_shared_library("bluetooth_renderer_sink") {
   subsystem_name = "multimedia"
 }
 
+ohos_shared_library("audio_bluetooth_client") {
+  install_enable = true
+  sources = [
+    "//foundation/multimedia/audio_standard/services/src/audio_bluetooth/client/audio_bluetooth_manager.cpp",
+    "//foundation/multimedia/audio_standard/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp",
+    "//foundation/multimedia/audio_standard/services/src/audio_bluetooth/client/bluetooth_a2dp_src_observer.cpp",
+  ]
+
+  include_dirs = [
+    "//foundation/communication/bluetooth/services/bluetooth_standard/ipc/include",
+    "//foundation/communication/bluetooth/services/bluetooth_standard/common/",
+    "//foundation/communication/bluetooth/interfaces/innerkits/native_cpp/include",
+    "//foundation/communication/bluetooth/interfaces/innerkits/native_cpp/framework/common",
+    "//foundation/communication/bluetooth/interfaces/innerkits/native_c/include",
+    "//foundation/multimedia/audio_standard/services/src/audio_policy/server/service/include/interface",
+    "//foundation/multimedia/audio_standard/services/include/audio_bluetooth/client",
+    "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
+    "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
+    "//utils/native/base/include",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "//drivers/peripheral/bluetooth/audio/interfaces/include",
+    "//drivers/peripheral/bluetooth/audio/hal/hdi_binder/proxy/include",
+  ]
+
+  deps = [
+    "$hdf_uhdf_path/hdi:libhdi",
+    "$hdf_uhdf_path/host:libhdf_host",
+    "$hdf_uhdf_path/ipc:libhdf_ipc_adapter",
+    "$hdf_uhdf_path/utils:libhdf_utils",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
+    "//foundation/communication/bluetooth/services/bluetooth_standard/ipc:btipc_static",
+    "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
+    "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:bluetooth_renderer_sink",
+    "//utils/native/base:utils",
+  ]
+
+  external_deps = [
+    "hiviewdfx_hilog_native:libhilog",
+    "ipc:ipc_core",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
+  ]
+
+  part_name = "multimedia_audio_standard"
+  subsystem_name = "multimedia"
+}
+
 ohos_shared_library("renderer_sink_adapter") {
   install_enable = true
 
diff --git a/frameworks/native/audiorenderer/include/audio_renderer_private.h b/frameworks/native/audiorenderer/include/audio_renderer_private.h
index a33eff52..c5b13ef2 100644
--- a/frameworks/native/audiorenderer/include/audio_renderer_private.h
+++ b/frameworks/native/audiorenderer/include/audio_renderer_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -64,13 +64,13 @@ public:
     int32_t Clear() const override;
     int32_t GetBufQueueState(BufferQueueState &bufState) const override;
 
-    std::shared_ptr<AudioStream> audioStream_;
     AudioRendererInfo rendererInfo_ = {};
 
     explicit AudioRendererPrivate(AudioStreamType audioStreamType);
     ~AudioRendererPrivate();
 
 private:
+    std::shared_ptr<AudioStream> audioStream_;
     std::shared_ptr<AudioInterruptCallback> audioInterruptCallback_ = nullptr;
     std::shared_ptr<AudioStreamCallback> audioStreamCallback_ = nullptr;
     AudioInterrupt audioInterrupt_ =
@@ -93,7 +93,7 @@ private:
     bool HandleForceDucking(const InterruptEventInternal &interruptEvent);
     std::shared_ptr<AudioStream> audioStream_;
     std::weak_ptr<AudioRendererCallback> callback_;
-    std::shared_ptr<AudioRendererCallback> cb;
+    std::shared_ptr<AudioRendererCallback> cb_;
     AudioInterrupt audioInterrupt_ {};
     bool isForcePaused_ = false;
     bool isForceDucked_ = false;
diff --git a/frameworks/native/audiorenderer/include/audio_renderer_sink.h b/frameworks/native/audiorenderer/include/audio_renderer_sink.h
index e35da24a..1db11ea6 100644
--- a/frameworks/native/audiorenderer/include/audio_renderer_sink.h
+++ b/frameworks/native/audiorenderer/include/audio_renderer_sink.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -62,7 +62,7 @@ private:
     struct AudioProxyManager *audioManager_;
     struct AudioAdapter *audioAdapter_;
     struct AudioRender *audioRender_;
-    struct AudioPort audioPort;
+    struct AudioPort audioPort_;
 
     int32_t CreateRender(struct AudioPort &renderPort);
     int32_t InitAudioManager();
diff --git a/frameworks/native/audiorenderer/include/audio_renderer_sink_intf.h b/frameworks/native/audiorenderer/include/audio_renderer_sink_intf.h
index 3f259f81..07be946a 100644
--- a/frameworks/native/audiorenderer/include/audio_renderer_sink_intf.h
+++ b/frameworks/native/audiorenderer/include/audio_renderer_sink_intf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/include/bluetooth_renderer_sink.h b/frameworks/native/audiorenderer/include/bluetooth_renderer_sink.h
index 49e78dc2..261006dd 100644
--- a/frameworks/native/audiorenderer/include/bluetooth_renderer_sink.h
+++ b/frameworks/native/audiorenderer/include/bluetooth_renderer_sink.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/include/bluetooth_renderer_sink_intf.h b/frameworks/native/audiorenderer/include/bluetooth_renderer_sink_intf.h
index ac5ef78b..f5143003 100644
--- a/frameworks/native/audiorenderer/include/bluetooth_renderer_sink_intf.h
+++ b/frameworks/native/audiorenderer/include/bluetooth_renderer_sink_intf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/include/renderer_sink_adapter.h b/frameworks/native/audiorenderer/include/renderer_sink_adapter.h
index 889b724a..04206939 100644
--- a/frameworks/native/audiorenderer/include/renderer_sink_adapter.h
+++ b/frameworks/native/audiorenderer/include/renderer_sink_adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp
index ab63e1e4..291a2d8e 100644
--- a/frameworks/native/audiorenderer/src/audio_renderer.cpp
+++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -44,7 +44,7 @@ std::unique_ptr<AudioRenderer> AudioRenderer::Create(const AudioRendererOptions
                              "Invalid content type");
 
     StreamUsage streamUsage = rendererOptions.rendererInfo.streamUsage;
-    CHECK_AND_RETURN_RET_LOG(streamUsage >= STREAM_USAGE_UNKNOWN && streamUsage <= STREAM_USAGE_VOICE_ASSISTANT,
+    CHECK_AND_RETURN_RET_LOG(streamUsage >= STREAM_USAGE_UNKNOWN && streamUsage <= STREAM_USAGE_NOTIFICATION_RINGTONE,
                              nullptr, "Invalid stream usage");
 
     AudioStreamType audioStreamType = AudioStream::GetStreamType(contentType, streamUsage);
@@ -381,11 +381,11 @@ void AudioInterruptCallbackImpl::NotifyEvent(const InterruptEvent &interruptEven
     MEDIA_DEBUG_LOG("AudioRendererPrivate: NotifyEvent: Hint: %{public}d", interruptEvent.hintType);
     MEDIA_DEBUG_LOG("AudioRendererPrivate: NotifyEvent: eventType: %{public}d", interruptEvent.eventType);
 
-    if (cb != nullptr) {
-        cb->OnInterrupt(interruptEvent);
+    if (cb_ != nullptr) {
+        cb_->OnInterrupt(interruptEvent);
         MEDIA_DEBUG_LOG("AudioRendererPrivate: OnInterrupt : NotifyEvent to app complete");
     } else {
-        MEDIA_DEBUG_LOG("AudioRendererPrivate: cb == nullptr cannont NotifyEvent to app");
+        MEDIA_DEBUG_LOG("AudioRendererPrivate: cb_ == nullptr cannont NotifyEvent to app");
     }
 }
 
@@ -481,7 +481,7 @@ void AudioInterruptCallbackImpl::HandleAndNotifyForcedEvent(const InterruptEvent
 
 void AudioInterruptCallbackImpl::OnInterrupt(const InterruptEventInternal &interruptEvent)
 {
-    cb = callback_.lock();
+    cb_ = callback_.lock();
     InterruptForceType forceType = interruptEvent.forceType;
     MEDIA_DEBUG_LOG("AudioRendererPrivate: OnInterrupt InterruptForceType: %{public}d", forceType);
 
diff --git a/frameworks/native/audiorenderer/src/audio_renderer_sink.cpp b/frameworks/native/audiorenderer/src/audio_renderer_sink.cpp
index a7fd2e14..02542919 100644
--- a/frameworks/native/audiorenderer/src/audio_renderer_sink.cpp
+++ b/frameworks/native/audiorenderer/src/audio_renderer_sink.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -95,7 +95,7 @@ void AudioRendererSink::DeInit()
 int32_t InitAttrs(struct AudioSampleAttributes &attrs)
 {
     /* Initialization of audio parameters for playback */
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     attrs.format = AUDIO_FORMAT_PCM_32_BIT;
     attrs.frameSize = PCM_32_BIT * attrs.channelCount / PCM_8_BIT;
 #else
@@ -117,7 +117,7 @@ int32_t InitAttrs(struct AudioSampleAttributes &attrs)
     return SUCCESS;
 }
 
-static int32_t SwitchAdapter(struct AudioAdapterDescriptor *descs, string adapterNameCase,
+static int32_t SwitchAdapterRender(struct AudioAdapterDescriptor *descs, string adapterNameCase,
     enum AudioPortDirection portFlag, struct AudioPort &renderPort, int32_t size)
 {
     if (descs == nullptr) {
@@ -139,7 +139,7 @@ static int32_t SwitchAdapter(struct AudioAdapterDescriptor *descs, string adapte
             }
         }
     }
-    MEDIA_ERR_LOG("SwitchAdapter Fail");
+    MEDIA_ERR_LOG("SwitchAdapterRender Fail");
 
     return ERR_INVALID_INDEX;
 }
@@ -200,7 +200,7 @@ int32_t AudioRendererSink::CreateRender(struct AudioPort &renderPort)
 int32_t AudioRendererSink::Init(AudioSinkAttr &attr)
 {
     attr_ = attr;
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     string adapterNameCase = "internal";  // Set sound card information
 #else
     string adapterNameCase = "usb";  // Set sound card information
@@ -222,7 +222,7 @@ int32_t AudioRendererSink::Init(AudioSinkAttr &attr)
     }
 
     // Get qualified sound card and port
-    int32_t index = SwitchAdapter(descs, adapterNameCase, port, audioPort, size);
+    int32_t index = SwitchAdapterRender(descs, adapterNameCase, port, audioPort_, size);
     if (index < 0) {
         MEDIA_ERR_LOG("Switch Adapter Fail");
         return ERR_NOT_STARTED;
@@ -245,12 +245,12 @@ int32_t AudioRendererSink::Init(AudioSinkAttr &attr)
         return ERR_NOT_STARTED;
     }
 
-    if (CreateRender(audioPort) != 0) {
-        MEDIA_ERR_LOG("Create render faied");
+    if (CreateRender(audioPort_) != 0) {
+        MEDIA_ERR_LOG("Create render failed, Audio Port: %{public}d", audioPort_.portId);
         return ERR_NOT_STARTED;
     }
 
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     ret = OpenOutput(DEVICE_TYPE_SPEAKER);
     if (ret < 0) {
         MEDIA_ERR_LOG("AudioRendererSink: Update route FAILED: %{public}d", ret);
@@ -367,7 +367,7 @@ int32_t AudioRendererSink::GetLatency(uint32_t *latency)
     }
 }
 
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
 static AudioCategory GetAudioCategory(AudioScene audioScene)
 {
     AudioCategory audioCategory;
@@ -436,7 +436,7 @@ int32_t AudioRendererSink::OpenOutput(DeviceType outputDevice)
     source.ext.mix.moduleId = 0;
     source.ext.mix.streamId = INTERNAL_OUTPUT_STREAM_ID;
 
-    sink.portId = audioPort.portId;
+    sink.portId = audioPort_.portId;
     sink.role = AUDIO_PORT_SINK_ROLE;
     sink.type = AUDIO_PORT_DEVICE_TYPE;
     sink.ext.device.moduleId = 0;
@@ -466,7 +466,7 @@ int32_t AudioRendererSink::SetAudioScene(AudioScene audioScene)
         return ERR_INVALID_HANDLE;
     }
 
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     int32_t ret = OpenOutput(DEVICE_TYPE_SPEAKER);
     if (ret < 0) {
         MEDIA_ERR_LOG("AudioRendererSink: Update route FAILED: %{public}d", ret);
@@ -475,8 +475,8 @@ int32_t AudioRendererSink::SetAudioScene(AudioScene audioScene)
     struct AudioSceneDescriptor scene;
     scene.scene.id = GetAudioCategory(audioScene);
     scene.desc.pins = PIN_OUT_SPEAKER;
-    if (audioRender_->scene.SelectScene == NULL) {
-        MEDIA_ERR_LOG("AudioRendererSink: Select scene NULL");
+    if (audioRender_->scene.SelectScene == nullptr) {
+        MEDIA_ERR_LOG("AudioRendererSink: Select scene nullptr");
         return ERR_OPERATION_FAILED;
     }
 
diff --git a/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp b/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp
index 3c37aeed..61c8b598 100644
--- a/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp
+++ b/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/src/renderer_sink_adapter.c b/frameworks/native/audiorenderer/src/renderer_sink_adapter.c
index f4a8e6fc..db473835 100644
--- a/frameworks/native/audiorenderer/src/renderer_sink_adapter.c
+++ b/frameworks/native/audiorenderer/src/renderer_sink_adapter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiosession/include/audio_session.h b/frameworks/native/audiosession/include/audio_session.h
index 3ad78737..3aed445c 100644
--- a/frameworks/native/audiosession/include/audio_session.h
+++ b/frameworks/native/audiosession/include/audio_session.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiostream/include/audio_stream.h b/frameworks/native/audiostream/include/audio_stream.h
index 8bd4c572..f1ffbbc7 100644
--- a/frameworks/native/audiostream/include/audio_stream.h
+++ b/frameworks/native/audiostream/include/audio_stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -36,12 +36,12 @@ public:
     int32_t SetAudioStreamInfo(const AudioStreamParams info);
     int32_t GetAudioStreamInfo(AudioStreamParams &info);
 
-    int32_t GetAudioSessionID(uint32_t &sessionID);
+    int32_t GetAudioSessionID(uint32_t &sessionID) const;
     State GetState();
-    bool GetAudioTime(Timestamp &timestamp, Timestamp::Timestampbase base);
-    int32_t GetBufferSize(size_t &bufferSize);
-    int32_t GetFrameCount(uint32_t &frameCount);
-    int32_t GetLatency(uint64_t &latency);
+    bool GetAudioTime(Timestamp &timestamp, Timestamp::Timestampbase base) const;
+    int32_t GetBufferSize(size_t &bufferSize) const;
+    int32_t GetFrameCount(uint32_t &frameCount) const;
+    int32_t GetLatency(uint64_t &latency) const;
     static AudioStreamType GetStreamType(ContentType contentType, StreamUsage streamUsage);
     int32_t SetAudioStreamType(AudioStreamType audioStreamType);
     int32_t SetVolume(float volume);
@@ -56,10 +56,10 @@ public:
     int32_t Enqueue(const BufferDesc &bufDesc);
     int32_t Clear();
 
-    std::vector<AudioSampleFormat> GetSupportedFormats();
-    std::vector<AudioChannel> GetSupportedChannels();
-    std::vector<AudioEncodingType> GetSupportedEncodingTypes();
-    std::vector<AudioSamplingRate> GetSupportedSamplingRates();
+    std::vector<AudioSampleFormat> GetSupportedFormats() const;
+    std::vector<AudioChannel> GetSupportedChannels() const;
+    std::vector<AudioEncodingType> GetSupportedEncodingTypes() const;
+    std::vector<AudioSamplingRate> GetSupportedSamplingRates() const;
 
     // Common APIs
     bool StartAudioStream();
@@ -90,14 +90,8 @@ private:
     bool isReadyToWrite_;
     void WriteBuffers();
 
-    static constexpr AudioStreamType streamTypeMap_[CONTENT_TYPE_RINGTONE + 1][STREAM_USAGE_VOICE_ASSISTANT + 1] = {
-        {STREAM_MUSIC, STREAM_MUSIC, STREAM_MUSIC, STREAM_MUSIC, STREAM_MUSIC},
-        {STREAM_MUSIC, STREAM_VOICE_ASSISTANT, STREAM_VOICE_CALL, STREAM_MUSIC, STREAM_VOICE_ASSISTANT},
-        {STREAM_MUSIC, STREAM_MUSIC, STREAM_MUSIC, STREAM_RING, STREAM_VOICE_ASSISTANT},
-        {STREAM_MEDIA, STREAM_MEDIA, STREAM_MUSIC, STREAM_MUSIC, STREAM_MUSIC},
-        {STREAM_NOTIFICATION, STREAM_NOTIFICATION, STREAM_MUSIC, STREAM_MUSIC, STREAM_MUSIC},
-        {STREAM_RING, STREAM_RING, STREAM_MUSIC, STREAM_RING, STREAM_MUSIC}
-    };
+    static const std::map<std::pair<ContentType, StreamUsage>, AudioStreamType> streamTypeMap_;
+    static std::map<std::pair<ContentType, StreamUsage>, AudioStreamType> CreateStreamMap();
 };
 } // namespace AudioStandard
 } // namespace OHOS
diff --git a/frameworks/native/libsnd/BUILD.gn b/frameworks/native/libsnd/BUILD.gn
index b08209a8..7fd829df 100644
--- a/frameworks/native/libsnd/BUILD.gn
+++ b/frameworks/native/libsnd/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/opensles/BUILD.gn b/frameworks/native/opensles/BUILD.gn
index 78b61569..087cbe6b 100644
--- a/frameworks/native/opensles/BUILD.gn
+++ b/frameworks/native/opensles/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/include/OpenSLES_OpenHarmony.h b/frameworks/native/opensles/include/OpenSLES_OpenHarmony.h
index 9eca4f71..5dc5ad14 100644
--- a/frameworks/native/opensles/include/OpenSLES_OpenHarmony.h
+++ b/frameworks/native/opensles/include/OpenSLES_OpenHarmony.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/include/audioplayer_adapter.h b/frameworks/native/opensles/include/audioplayer_adapter.h
index cdea1aee..05660103 100644
--- a/frameworks/native/opensles/include/audioplayer_adapter.h
+++ b/frameworks/native/opensles/include/audioplayer_adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/include/common.h b/frameworks/native/opensles/include/common.h
index 9bb604a9..5967d7c5 100644
--- a/frameworks/native/opensles/include/common.h
+++ b/frameworks/native/opensles/include/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/include/writecallback_adapter.h b/frameworks/native/opensles/include/writecallback_adapter.h
index 426000b0..1f9d3538 100644
--- a/frameworks/native/opensles/include/writecallback_adapter.h
+++ b/frameworks/native/opensles/include/writecallback_adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp b/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp
index 18257611..99d82e37 100644
--- a/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp
+++ b/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/adapter/writecallback_adapter.cpp b/frameworks/native/opensles/src/adapter/writecallback_adapter.cpp
index 14e38e4b..9a80d0d4 100644
--- a/frameworks/native/opensles/src/adapter/writecallback_adapter.cpp
+++ b/frameworks/native/opensles/src/adapter/writecallback_adapter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/itf/engine_itf.cpp b/frameworks/native/opensles/src/itf/engine_itf.cpp
index 03481f4f..acae804b 100644
--- a/frameworks/native/opensles/src/itf/engine_itf.cpp
+++ b/frameworks/native/opensles/src/itf/engine_itf.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
@@ -42,6 +42,9 @@ static SLresult CreateAudioPlayer(
     }
     ClassTable *audioPlayerClass = ObjectIdToClass(SL_OBJECTID_AUDIOPLAYER);
     CAudioPlayer *thiz = (CAudioPlayer *) Construct(audioPlayerClass, self);
+    if (thiz == nullptr) {
+        return SL_RESULT_PARAMETER_INVALID;
+    }
     thiz->mId = audioplayerId;
     IObjectInit(&thiz->mObject);
     IPlayInit(&thiz->mPlay, audioplayerId);
@@ -92,6 +95,9 @@ static SLresult CreateOutputMix(
     }
     ClassTable *outputMixClass = ObjectIdToClass(SL_OBJECTID_OUTPUTMIX);
     COutputMix *thiz = (COutputMix *) Construct(outputMixClass, self);
+    if (thiz == nullptr) {
+        return SL_RESULT_PARAMETER_INVALID;
+    }
     IObjectInit(&thiz->mObject);
     *pMix = &thiz->mObject.mItf;
     return SL_RESULT_SUCCESS;
diff --git a/frameworks/native/opensles/src/itf/object_itf.cpp b/frameworks/native/opensles/src/itf/object_itf.cpp
index 88e4e723..1afd6cce 100644
--- a/frameworks/native/opensles/src/itf/object_itf.cpp
+++ b/frameworks/native/opensles/src/itf/object_itf.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/itf/openharmony_buffer_queue_itf.cpp b/frameworks/native/opensles/src/itf/openharmony_buffer_queue_itf.cpp
index cf786d4a..22b4c388 100644
--- a/frameworks/native/opensles/src/itf/openharmony_buffer_queue_itf.cpp
+++ b/frameworks/native/opensles/src/itf/openharmony_buffer_queue_itf.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/itf/play_itf.cpp b/frameworks/native/opensles/src/itf/play_itf.cpp
index 89f2aad8..b43b0702 100644
--- a/frameworks/native/opensles/src/itf/play_itf.cpp
+++ b/frameworks/native/opensles/src/itf/play_itf.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/itf/volume_itf.cpp b/frameworks/native/opensles/src/itf/volume_itf.cpp
index db1154ef..18ce8f5e 100644
--- a/frameworks/native/opensles/src/itf/volume_itf.cpp
+++ b/frameworks/native/opensles/src/itf/volume_itf.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/obj/audioplayer_obj.cpp b/frameworks/native/opensles/src/obj/audioplayer_obj.cpp
index 03c31245..76c23a59 100644
--- a/frameworks/native/opensles/src/obj/audioplayer_obj.cpp
+++ b/frameworks/native/opensles/src/obj/audioplayer_obj.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/obj/engine_obj.cpp b/frameworks/native/opensles/src/obj/engine_obj.cpp
index 57757067..b8c73efd 100644
--- a/frameworks/native/opensles/src/obj/engine_obj.cpp
+++ b/frameworks/native/opensles/src/obj/engine_obj.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/obj/output_mix_obj.cpp b/frameworks/native/opensles/src/obj/output_mix_obj.cpp
index fa24815f..08aeba82 100644
--- a/frameworks/native/opensles/src/obj/output_mix_obj.cpp
+++ b/frameworks/native/opensles/src/obj/output_mix_obj.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/util/OpenSLES_OpenHarmony_IID.cpp b/frameworks/native/opensles/src/util/OpenSLES_OpenHarmony_IID.cpp
index 5a5bf4d3..048d28df 100644
--- a/frameworks/native/opensles/src/util/OpenSLES_OpenHarmony_IID.cpp
+++ b/frameworks/native/opensles/src/util/OpenSLES_OpenHarmony_IID.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/frameworks/native/opensles/src/util/builder.cpp b/frameworks/native/opensles/src/util/builder.cpp
index 5648fedf..cea022de 100644
--- a/frameworks/native/opensles/src/util/builder.cpp
+++ b/frameworks/native/opensles/src/util/builder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
@@ -24,6 +24,9 @@ SLresult SLAPIENTRY slCreateEngine(SLObjectItf *pEngine, SLuint32 numOptions,
     }
     ClassTable *engineClass = ObjectIdToClass(SL_OBJECTID_ENGINE);
     CEngine *thiz = (CEngine *) Construct(engineClass, nullptr);
+    if (thiz == nullptr) {
+        return SL_RESULT_PARAMETER_INVALID;
+    }
     IObjectInit(&thiz->mObject);
     IEngineInit(&thiz->mEngine);
     *pEngine = &thiz->mObject.mItf;
@@ -45,6 +48,9 @@ ClassTable *ObjectIdToClass(SLuint32 objectId)
 
 IObject *Construct(const ClassTable *classTable, SLEngineItf engine)
 {
+    if (classTable == nullptr) {
+        return nullptr;
+    }
     IObject *thiz = (IObject *) calloc(1, classTable->mSize);
     if (thiz != nullptr) {
         IEngine *thisEngine = (IEngine *) engine;
diff --git a/frameworks/native/opensles/src/util/table_struct.cpp b/frameworks/native/opensles/src/util/table_struct.cpp
index a668c4c4..8fc65b51 100644
--- a/frameworks/native/opensles/src/util/table_struct.cpp
+++ b/frameworks/native/opensles/src/util/table_struct.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
@@ -28,4 +28,4 @@ ClassTable AudioPlayerTab = {
 ClassTable OutputMixTab = {
     SL_OBJECTID_OUTPUTMIX,
     sizeof(CAudioPlayer),
-};
\ No newline at end of file
+};
diff --git a/frameworks/native/pulseaudio/BUILD.gn b/frameworks/native/pulseaudio/BUILD.gn
index 9a42ec8a..96962348 100644
--- a/frameworks/native/pulseaudio/BUILD.gn
+++ b/frameworks/native/pulseaudio/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
@@ -13,38 +13,43 @@
 
 import("//build/ohos.gni")
 
-pulseaudio_build_path = "//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
-libsndfile_build_path = "//foundation/multimedia/audio_standard/frameworks/native/libsnd"
+pulseaudio_build_path =
+    "//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
+libsndfile_build_path =
+    "//foundation/multimedia/audio_standard/frameworks/native/libsnd"
 
 group("pulseaudio_packages") {
   deps = [
     # ":gen_config_header",
     "$libsndfile_build_path:sndfile",
-    "$pulseaudio_build_path/src:pulsecommon",
-    "$pulseaudio_build_path/src/pulse:pulse",
+    "$pulseaudio_build_path/src:pa_client_config",
     "$pulseaudio_build_path/src:pa_daemon_config",
     "$pulseaudio_build_path/src:pa_default_config",
-    "$pulseaudio_build_path/src:pa_client_config",
-    "$pulseaudio_build_path/src/pulse:pulse-simple",
-    "$pulseaudio_build_path/src/pulse:pulse-mainloop-glib",
-    "$pulseaudio_build_path/src/pulsecore:pulsecore",
-    "$pulseaudio_build_path/src/pulsecore:protocol-native",
-    "$pulseaudio_build_path/src/pulsecore:cli",
-    "$pulseaudio_build_path/src/pulsecore:protocol-cli",
+    "$pulseaudio_build_path/src:pulsecommon",
     "$pulseaudio_build_path/src/daemon:pulseaudio",
-    "$pulseaudio_build_path/src/utils:pacmd",
-    "$pulseaudio_build_path/src/utils:pacat",
-    "$pulseaudio_build_path/src/utils:pactl",
     "$pulseaudio_build_path/src/modules:modules",
     "$pulseaudio_build_path/src/modules/hdi:module-hdi-sink",
     "$pulseaudio_build_path/src/modules/hdi:module-hdi-source",
+    "$pulseaudio_build_path/src/pulse:pulse",
+    "$pulseaudio_build_path/src/pulse:pulse-mainloop-glib",
+    "$pulseaudio_build_path/src/pulse:pulse-simple",
+    "$pulseaudio_build_path/src/pulsecore:cli",
+    "$pulseaudio_build_path/src/pulsecore:protocol-cli",
+    "$pulseaudio_build_path/src/pulsecore:protocol-native",
+    "$pulseaudio_build_path/src/pulsecore:pulsecore",
+    "$pulseaudio_build_path/src/utils:pacat",
+    "$pulseaudio_build_path/src/utils:pacmd",
+    "$pulseaudio_build_path/src/utils:pactl",
   ]
 }
 
 action("gen_config_header") {
   script = "$pulseaudio_build_path/ohos_paconfig.sh"
 
-  args = [ rebase_path("//third_party/pulseaudio", root_build_dir), rebase_path( "${target_gen_dir}/", root_build_dir),]
+  args = [
+    rebase_path("//third_party/pulseaudio", root_build_dir),
+    rebase_path("${target_gen_dir}/", root_build_dir),
+  ]
 
-  outputs = [ "${target_gen_dir}/config.h", ]
+  outputs = [ "${target_gen_dir}/config.h" ]
 }
diff --git a/frameworks/native/pulseaudio/include/ltdl.h b/frameworks/native/pulseaudio/include/ltdl.h
index 0f47bd3b..0f473f2b 100644
--- a/frameworks/native/pulseaudio/include/ltdl.h
+++ b/frameworks/native/pulseaudio/include/ltdl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/ohos_paconfig.sh b/frameworks/native/pulseaudio/ohos_paconfig.sh
index baac667a..24d478c5 100644
--- a/frameworks/native/pulseaudio/ohos_paconfig.sh
+++ b/frameworks/native/pulseaudio/ohos_paconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/src/BUILD.gn b/frameworks/native/pulseaudio/src/BUILD.gn
index e78ab558..06ae0acc 100644
--- a/frameworks/native/pulseaudio/src/BUILD.gn
+++ b/frameworks/native/pulseaudio/src/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/src/daemon/BUILD.gn b/frameworks/native/pulseaudio/src/daemon/BUILD.gn
index 87b3449b..0c6681ee 100644
--- a/frameworks/native/pulseaudio/src/daemon/BUILD.gn
+++ b/frameworks/native/pulseaudio/src/daemon/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/src/modules/BUILD.gn b/frameworks/native/pulseaudio/src/modules/BUILD.gn
index 4952d0f3..0370e302 100644
--- a/frameworks/native/pulseaudio/src/modules/BUILD.gn
+++ b/frameworks/native/pulseaudio/src/modules/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/src/modules/hdi/BUILD.gn b/frameworks/native/pulseaudio/src/modules/hdi/BUILD.gn
index 6fd6cabe..41db87a7 100644
--- a/frameworks/native/pulseaudio/src/modules/hdi/BUILD.gn
+++ b/frameworks/native/pulseaudio/src/modules/hdi/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
@@ -51,8 +51,8 @@ ohos_shared_library("module-hdi-sink") {
   configs = [ ":hdi_config" ]
 
   cflags = [ "-DPA_MODULE_NAME=libmodule_hdi_sink_z_so" ]
-  if (device_name == "baltimore") {
-    cflags += [ "-DDEVICE_BALTIMORE" ]
+  if ("${product_name}" == "m40") {
+    cflags += [ "-DPRODUCT_M40" ]
   }
 
   ldflags = [
@@ -82,12 +82,10 @@ ohos_shared_library("module-hdi-source") {
   configs = [ ":hdi_config" ]
 
   cflags = [ "-DPA_MODULE_NAME=libmodule_hdi_source_z_so" ]
-  if (device_name == "baltimore") {
-    cflags += [ "-DDEVICE_BALTIMORE" ]
-  }
-
-  if (device_name == "rk3568") {
-    cflags += [ "-DDEVICE_RK3568" ]
+  if ("${product_name}" == "m40") {
+    cflags += [ "-DPRODUCT_M40" ]
+  } else if ("${product_name}" == "rk3568") {
+    cflags += [ "-DPRODUCT_RK3568" ]
   }
 
   deps = [
diff --git a/frameworks/native/pulseaudio/src/modules/hdi/hdi_sink.c b/frameworks/native/pulseaudio/src/modules/hdi/hdi_sink.c
index 090324f6..786b7da0 100644
--- a/frameworks/native/pulseaudio/src/modules/hdi/hdi_sink.c
+++ b/frameworks/native/pulseaudio/src/modules/hdi/hdi_sink.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -139,8 +139,9 @@ static void ProcessRenderUseTiming(struct Userdata *u, pa_usec_t now)
             u->bytes_dropped = 0;
         }
 
-        if (u->bytes_dropped == 0 && dropped != 0)
+        if (u->bytes_dropped == 0 && dropped != 0) {
             MEDIA_INFO_LOG("HDI-sink just dropped %zu bytes", dropped);
+        }
 
         u->bytes_dropped += dropped;
 
@@ -166,11 +167,13 @@ static void ThreadFuncUseTiming(void *userdata)
         pa_usec_t now = 0;
         int ret;
 
-        if (PA_SINK_IS_RUNNING(u->sink->thread_info.state))
+        if (PA_SINK_IS_RUNNING(u->sink->thread_info.state)) {
             now = pa_rtclock_now();
+        }
 
-        if (PA_UNLIKELY(u->sink->thread_info.rewind_requested))
+        if (PA_UNLIKELY(u->sink->thread_info.rewind_requested)) {
             pa_sink_process_rewind(u->sink, 0);
+        }
 
         // Render some data and drop it immediately
         if (PA_SINK_IS_RUNNING(u->sink->thread_info.state)) {
@@ -178,12 +181,14 @@ static void ThreadFuncUseTiming(void *userdata)
                 ProcessRenderUseTiming(u, now);
 
             pa_rtpoll_set_timer_absolute(u->rtpoll, u->timestamp);
-        } else
+        } else {
             pa_rtpoll_set_timer_disabled(u->rtpoll);
+        }
 
         // Hmm, nothing to do. Let's sleep
-        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0) {
             goto fail;
+        }
 
         if (ret == 0) {
             goto finish;
@@ -201,7 +206,7 @@ finish:
     MEDIA_INFO_LOG("Thread (use timing) shutting down");
 }
 
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
 static void SinkUpdateRequestedLatencyCb(pa_sink *s)
 {
     struct Userdata *u = NULL;
@@ -325,11 +330,7 @@ static int32_t PrepareDevice(struct Userdata *u)
 {
     SinkAttr sample_attrs;
     int32_t ret;
-#ifdef DEVICE_BALTIMORE
-    sample_attrs.format = AUDIO_FORMAT_PCM_32_BIT;
-#else
-    sample_attrs.format = AUDIO_FORMAT_PCM_16_BIT;
-#endif
+
     enum AudioFormat format = ConvertToHDIAudioFormat(u->ss.format);
     sample_attrs.format = format;
     sample_attrs.sampleFmt = format;
@@ -437,7 +438,7 @@ pa_sink *PaHdiSinkNew(pa_module *m, pa_modargs *ma, const char *driver)
 
     u->sink->parent.process_msg = SinkProcessMsg;
     u->sink->set_state_in_io_thread = SinkSetStateInIoThreadCb;
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     u->sink->update_requested_latency = SinkUpdateRequestedLatencyCb;
 #endif
     u->sink->userdata = u;
@@ -453,26 +454,22 @@ pa_sink *PaHdiSinkNew(pa_module *m, pa_modargs *ma, const char *driver)
     }
 
     u->block_usec = pa_bytes_to_usec(u->buffer_size, &u->sink->sample_spec);
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     pa_sink_set_latency_range(u->sink, 0, u->block_usec);
 #else
     pa_sink_set_fixed_latency(u->sink, u->block_usec);
 #endif
     pa_sink_set_max_request(u->sink, u->buffer_size);
 
-    threadName = pa_sprintf_malloc("hdi-sink-playback");
+    threadName = "hdi-sink-playback";
     if (!(u->thread = pa_thread_new(threadName, ThreadFuncUseTiming, u))) {
         MEDIA_ERR_LOG("Failed to create thread.");
         goto fail;
     }
-    pa_xfree(threadName);
-    threadName = NULL;
-
     pa_sink_put(u->sink);
 
     return u->sink;
 fail:
-    pa_xfree(threadName);
     UserdataFree(u);
 
     return NULL;
diff --git a/frameworks/native/pulseaudio/src/modules/hdi/hdi_source.c b/frameworks/native/pulseaudio/src/modules/hdi/hdi_source.c
index 3f7f8b98..6251dee7 100644
--- a/frameworks/native/pulseaudio/src/modules/hdi/hdi_source.c
+++ b/frameworks/native/pulseaudio/src/modules/hdi/hdi_source.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -330,7 +330,7 @@ static int pa_set_source_properties(pa_module *m, pa_modargs *ma, const pa_sampl
     return 0;
 }
 
-#ifndef DEVICE_RK3568
+#ifndef PRODUCT_RK3568
 static enum AudioFormat ConvertToHDIAudioFormat(pa_sample_format_t format)
 {
     enum AudioFormat hdiAudioFormat;
@@ -376,7 +376,7 @@ static bool GetEndianInfo(pa_sample_format_t format)
 
     return isBigEndian;
 }
-#endif // #ifndef DEVICE_RK3568
+#endif // #ifndef PRODUCT_RK3568
 
 pa_source *pa_hdi_source_new(pa_module *m, pa_modargs *ma, const char *driver)
 {
@@ -395,10 +395,12 @@ pa_source *pa_hdi_source_new(pa_module *m, pa_modargs *ma, const char *driver)
     /* Override with modargs if provided */
     if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0) {
         MEDIA_INFO_LOG("Failed to parse sample specification and channel map");
-        goto fail;
+        return NULL;
     }
 
     u = pa_xnew0(struct Userdata, 1);
+    pa_assert(u);
+
     u->core = m->core;
     u->module = m;
     u->rtpoll = pa_rtpoll_new();
@@ -411,7 +413,7 @@ pa_source *pa_hdi_source_new(pa_module *m, pa_modargs *ma, const char *driver)
     u->buffer_size = DEFAULT_BUFFER_SIZE;
     u->attrs.sampleRate = ss.rate;
 // The values for rk are hardcoded due to config mismatch in hdi. To be removed once hdi issue is fixed.
-#ifdef DEVICE_RK3568
+#ifdef PRODUCT_RK3568
     int32_t channelCount = 2;
     u->attrs.channel = channelCount;
     u->attrs.format = AUDIO_FORMAT_PCM_16_BIT;
@@ -437,26 +439,21 @@ pa_source *pa_hdi_source_new(pa_module *m, pa_modargs *ma, const char *driver)
         goto fail;
     }
 
-    thread_name = pa_sprintf_malloc("hdi-source-record");
+    thread_name = "hdi-source-record";
     if (!(u->thread = pa_thread_new(thread_name, thread_func, u))) {
         MEDIA_INFO_LOG("Failed to create hdi-source-record thread!");
         goto fail;
     }
 
-    pa_xfree(thread_name);
-    thread_name = NULL;
     pa_source_put(u->source);
     return u->source;
 
 fail:
-    pa_xfree(thread_name);
 
-    if (u) {
-        if (u->IsCapturerStarted) {
-            pa_capturer_exit();
-        }
-        userdata_free(u);
+    if (u->IsCapturerStarted) {
+        pa_capturer_exit();
     }
+    userdata_free(u);
 
     return NULL;
 }
diff --git a/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_sink.c b/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_sink.c
index 71b9ac96..27ec8476 100644
--- a/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_sink.c
+++ b/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_sink.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_source.c b/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_source.c
index 46713257..31346fe6 100644
--- a/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_source.c
+++ b/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_source.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -62,8 +62,9 @@ int pa__init(pa_module *m)
         goto fail;
     }
 
-    if (!(m->userdata = pa_hdi_source_new(m, ma, __FILE__)))
+    if (!(m->userdata = pa_hdi_source_new(m, ma, __FILE__))) {
         goto fail;
+    }
 
     pa_modargs_free(ma);
 
@@ -71,8 +72,9 @@ int pa__init(pa_module *m)
 
 fail:
 
-    if (ma)
+    if (ma) {
         pa_modargs_free(ma);
+    }
 
     pa__done(m);
 
@@ -95,6 +97,7 @@ void pa__done(pa_module *m)
 
     pa_assert(m);
 
-    if ((source = m->userdata))
+    if ((source = m->userdata)) {
         pa_hdi_source_free(source);
+    }
 }
diff --git a/frameworks/native/pulseaudio/src/pulse/BUILD.gn b/frameworks/native/pulseaudio/src/pulse/BUILD.gn
index b4c61a0c..3bb04db7 100644
--- a/frameworks/native/pulseaudio/src/pulse/BUILD.gn
+++ b/frameworks/native/pulseaudio/src/pulse/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/src/pulsecore/BUILD.gn b/frameworks/native/pulseaudio/src/pulsecore/BUILD.gn
index 5399de17..dd687794 100644
--- a/frameworks/native/pulseaudio/src/pulsecore/BUILD.gn
+++ b/frameworks/native/pulseaudio/src/pulsecore/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/src/pulsecore/ltdl_stub.c b/frameworks/native/pulseaudio/src/pulsecore/ltdl_stub.c
index 3ffcf43c..0f798e77 100644
--- a/frameworks/native/pulseaudio/src/pulsecore/ltdl_stub.c
+++ b/frameworks/native/pulseaudio/src/pulsecore/ltdl_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/pulseaudio/src/utils/BUILD.gn b/frameworks/native/pulseaudio/src/utils/BUILD.gn
index 8b6ab7f4..9cddae6b 100644
--- a/frameworks/native/pulseaudio/src/utils/BUILD.gn
+++ b/frameworks/native/pulseaudio/src/utils/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audiocapturer/BUILD.gn b/interfaces/inner_api/native/audiocapturer/BUILD.gn
index 440499d1..c5eb5ce9 100644
--- a/interfaces/inner_api/native/audiocapturer/BUILD.gn
+++ b/interfaces/inner_api/native/audiocapturer/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h b/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h
index eb3f3f44..50e4750a 100644
--- a/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h
+++ b/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audiocommon/include/audio_errors.h b/interfaces/inner_api/native/audiocommon/include/audio_errors.h
index 7ba81be4..417113cb 100644
--- a/interfaces/inner_api/native/audiocommon/include/audio_errors.h
+++ b/interfaces/inner_api/native/audiocommon/include/audio_errors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audiocommon/include/audio_info.h b/interfaces/inner_api/native/audiocommon/include/audio_info.h
index aaf95ef5..652a277b 100644
--- a/interfaces/inner_api/native/audiocommon/include/audio_info.h
+++ b/interfaces/inner_api/native/audiocommon/include/audio_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -31,6 +31,7 @@ constexpr int32_t MAX_NUM_STREAMS = 3;
 constexpr int32_t RENDERER_STREAM_USAGE_SHIFT = 16;
 constexpr int32_t MINIMUM_BUFFER_SIZE_MSEC = 5;
 constexpr int32_t MAXIMUM_BUFFER_SIZE_MSEC = 20;
+constexpr int32_t MIN_SERVICE_COUNT = 2;
 
 
 enum DeviceFlag {
@@ -283,8 +284,8 @@ enum StreamUsage {
     STREAM_USAGE_UNKNOWN = 0,
     STREAM_USAGE_MEDIA = 1,
     STREAM_USAGE_VOICE_COMMUNICATION = 2,
-    STREAM_USAGE_NOTIFICATION_RINGTONE = 3,
-    STREAM_USAGE_VOICE_ASSISTANT = 4
+    STREAM_USAGE_VOICE_ASSISTANT = 4,
+    STREAM_USAGE_NOTIFICATION_RINGTONE = 6
 };
 
 /**
@@ -517,6 +518,11 @@ struct InterruptAction {
     InterruptType interruptType;
     InterruptHint interruptHint;
 };
+
+enum AudioServiceIndex {
+    HDI_SERVICE_INDEX = 0,
+    AUDIO_SERVICE_INDEX
+};
 } // namespace AudioStandard
 } // namespace OHOS
 #endif // AUDIO_INFO_H
diff --git a/interfaces/inner_api/native/audiocommon/include/media_log.h b/interfaces/inner_api/native/audiocommon/include/media_log.h
index 8b4227fb..9d59811f 100644
--- a/interfaces/inner_api/native/audiocommon/include/media_log.h
+++ b/interfaces/inner_api/native/audiocommon/include/media_log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audiocommon/include/timestamp.h b/interfaces/inner_api/native/audiocommon/include/timestamp.h
index 2295c3b8..8323e1ce 100644
--- a/interfaces/inner_api/native/audiocommon/include/timestamp.h
+++ b/interfaces/inner_api/native/audiocommon/include/timestamp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audiomanager/BUILD.gn b/interfaces/inner_api/native/audiomanager/BUILD.gn
index ecc3e510..272e5a0b 100644
--- a/interfaces/inner_api/native/audiomanager/BUILD.gn
+++ b/interfaces/inner_api/native/audiomanager/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h b/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h
index 53131568..72290dd3 100644
--- a/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h
+++ b/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -173,7 +173,7 @@ public:
     bool IsMicrophoneMute(void) const;
     std::vector<sptr<AudioDeviceDescriptor>> GetDevices(DeviceFlag deviceFlag);
     const std::string GetAudioParameter(const std::string key) const;
-    void SetAudioParameter(const std::string key, const std::string value) const;
+    void SetAudioParameter(const std::string &key, const std::string &value) const;
     const char *RetrieveCookie(int32_t &size) const;
     int32_t SetDeviceActive(ActiveDeviceType deviceType, bool flag) const;
     bool IsDeviceActive(ActiveDeviceType deviceType) const;
diff --git a/interfaces/inner_api/native/audiorenderer/BUILD.gn b/interfaces/inner_api/native/audiorenderer/BUILD.gn
index 74e27db7..5d24df74 100644
--- a/interfaces/inner_api/native/audiorenderer/BUILD.gn
+++ b/interfaces/inner_api/native/audiorenderer/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h b/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h
index d0286adf..4ddf2477 100644
--- a/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h
+++ b/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audioringtone/BUILD.gn b/interfaces/inner_api/native/audioringtone/BUILD.gn
index f1357701..7bf223fb 100644
--- a/interfaces/inner_api/native/audioringtone/BUILD.gn
+++ b/interfaces/inner_api/native/audioringtone/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audioringtone/include/iringtone_player.h b/interfaces/inner_api/native/audioringtone/include/iringtone_player.h
index e6c88432..c28e1301 100644
--- a/interfaces/inner_api/native/audioringtone/include/iringtone_player.h
+++ b/interfaces/inner_api/native/audioringtone/include/iringtone_player.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/audioringtone/include/iringtone_sound_manager.h b/interfaces/inner_api/native/audioringtone/include/iringtone_sound_manager.h
index a333cf24..480158c2 100644
--- a/interfaces/inner_api/native/audioringtone/include/iringtone_sound_manager.h
+++ b/interfaces/inner_api/native/audioringtone/include/iringtone_sound_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/inner_api/native/opensles/BUILD.gn b/interfaces/inner_api/native/opensles/BUILD.gn
index e1e04cd2..0f8df894 100644
--- a/interfaces/inner_api/native/opensles/BUILD.gn
+++ b/interfaces/inner_api/native/opensles/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 2022 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
diff --git a/interfaces/kits/js/@ohos.multimedia.audio.d.ts b/interfaces/kits/js/@ohos.multimedia.audio.d.ts
index 57bc4335..4797b9c2 100644
--- a/interfaces/kits/js/@ohos.multimedia.audio.d.ts
+++ b/interfaces/kits/js/@ohos.multimedia.audio.d.ts
@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2021 Huawei Device Co., Ltd.
+* Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/@ohos.multimedia.session.d.ts b/interfaces/kits/js/@ohos.multimedia.session.d.ts
index b8885da8..a71888ea 100644
--- a/interfaces/kits/js/@ohos.multimedia.session.d.ts
+++ b/interfaces/kits/js/@ohos.multimedia.session.d.ts
@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2021 Huawei Device Co., Ltd.
+* Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/audio_capturer/include/audio_capturer_napi.h b/interfaces/kits/js/audio_capturer/include/audio_capturer_napi.h
index ca77638a..cc829da6 100644
--- a/interfaces/kits/js/audio_capturer/include/audio_capturer_napi.h
+++ b/interfaces/kits/js/audio_capturer/include/audio_capturer_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -53,6 +53,7 @@ private:
         uint32_t userSize;
         uint8_t *buffer = nullptr;
         size_t bytesRead;
+        size_t bufferSize;
         bool isBlocking;
         bool isTrue;
         AudioSampleFormat audioSampleFormat;
@@ -64,7 +65,7 @@ private:
         DeviceRole deviceRole;
         DeviceType deviceType;
         SourceType sourceType;
-        uint32_t capturerFlags;
+        int32_t capturerFlags;
         AudioCapturerNapi *objectInfo;
         AudioCapturerOptions capturerOptions;
     };
@@ -93,6 +94,7 @@ private:
     static void AudioStreamInfoAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void ReadAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void IsTrueAsyncCallbackComplete(napi_env env, napi_status status, void *data);
+    static void GetBufferSizeAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void GetIntValueAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void GetInt64ValueAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void VoidAsyncCallbackComplete(napi_env env, napi_status status, void *data);
diff --git a/interfaces/kits/js/audio_capturer/include/audio_parameters_napi.h b/interfaces/kits/js/audio_capturer/include/audio_parameters_napi.h
index 7dc3d939..c240137a 100644
--- a/interfaces/kits/js/audio_capturer/include/audio_parameters_napi.h
+++ b/interfaces/kits/js/audio_capturer/include/audio_parameters_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/audio_manager/@ohos.multimedia.audio.d.ts b/interfaces/kits/js/audio_manager/@ohos.multimedia.audio.d.ts
index ed68562f..435e2188 100644
--- a/interfaces/kits/js/audio_manager/@ohos.multimedia.audio.d.ts
+++ b/interfaces/kits/js/audio_manager/@ohos.multimedia.audio.d.ts
@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2021 Huawei Device Co., Ltd.
+* Copyright (c) 2021-2022 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
@@ -371,7 +371,7 @@ declare namespace audio {
      * Notification or ringtone usage.
      * @since 7
      */
-    STREAM_USAGE_NOTIFICATION_RINGTONE = 3
+    STREAM_USAGE_NOTIFICATION_RINGTONE = 6
   }
 
   /**
@@ -851,7 +851,7 @@ declare namespace audio {
      * @since 8
      * @syscap SystemCapability.Multimedia.Audio
      */
-    setAudioScene(scene: AudioScene, callback: AsyncCallback<void> ): void;
+    setAudioScene(scene: AudioScene, callback: AsyncCallback<void>): void;
     /**
      * Sets the audio scene mode to change audio strategy. This method uses a promise to return the execution result.
      * @since 8
@@ -863,7 +863,7 @@ declare namespace audio {
      * @since 8
      * @syscap SystemCapability.Multimedia.Audio
      */
-    getAudioScene(callback: AsyncCallback<AudioScene> ): void;
+    getAudioScene(callback: AsyncCallback<AudioScene>): void;
     /**
      * Obtains the system audio scene mode. This method uses a promise to return the execution result.
      * @since 8
diff --git a/interfaces/kits/js/audio_manager/BUILD.gn b/interfaces/kits/js/audio_manager/BUILD.gn
index 2584ea85..d5604a7c 100644
--- a/interfaces/kits/js/audio_manager/BUILD.gn
+++ b/interfaces/kits/js/audio_manager/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/audio_manager/include/audio_device_descriptor_napi.h b/interfaces/kits/js/audio_manager/include/audio_device_descriptor_napi.h
index 5c999c50..e99a6320 100644
--- a/interfaces/kits/js/audio_manager/include/audio_device_descriptor_napi.h
+++ b/interfaces/kits/js/audio_manager/include/audio_device_descriptor_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/audio_manager/include/audio_manager_napi.h b/interfaces/kits/js/audio_manager/include/audio_manager_napi.h
index 1e1ee705..c743e8fc 100644
--- a/interfaces/kits/js/audio_manager/include/audio_manager_napi.h
+++ b/interfaces/kits/js/audio_manager/include/audio_manager_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/audio_renderer/include/audio_renderer_napi.h b/interfaces/kits/js/audio_renderer/include/audio_renderer_napi.h
index a700c33d..6a4e5c8c 100644
--- a/interfaces/kits/js/audio_renderer/include/audio_renderer_napi.h
+++ b/interfaces/kits/js/audio_renderer/include/audio_renderer_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -61,6 +61,8 @@ private:
         bool isTrue;
         uint64_t time;
         size_t bufferLen;
+        size_t bufferSize;
+        size_t totalBytesWritten;
         void *data;
         AudioSampleFormat sampleFormat;
         AudioSamplingRate samplingRate;
@@ -103,6 +105,7 @@ private:
     static void SetFunctionAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void AudioParamsAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void IsTrueAsyncCallbackComplete(napi_env env, napi_status status, void *data);
+    static void GetBufferSizeAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void GetIntValueAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void GetInt64ValueAsyncCallbackComplete(napi_env env, napi_status status, void *data);
     static void WriteAsyncCallbackComplete(napi_env env, napi_status status, void *data);
diff --git a/interfaces/kits/js/ringtone_manager/include/audio_renderer_info_napi.h b/interfaces/kits/js/ringtone_manager/include/audio_renderer_info_napi.h
index ee636b18..fcf574a9 100644
--- a/interfaces/kits/js/ringtone_manager/include/audio_renderer_info_napi.h
+++ b/interfaces/kits/js/ringtone_manager/include/audio_renderer_info_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/ringtone_manager/include/ringtone_options_napi.h b/interfaces/kits/js/ringtone_manager/include/ringtone_options_napi.h
index 2cdd2943..f92f9d93 100644
--- a/interfaces/kits/js/ringtone_manager/include/ringtone_options_napi.h
+++ b/interfaces/kits/js/ringtone_manager/include/ringtone_options_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/ringtone_manager/include/ringtone_player_napi.h b/interfaces/kits/js/ringtone_manager/include/ringtone_player_napi.h
index 4e415a4c..40fb003b 100644
--- a/interfaces/kits/js/ringtone_manager/include/ringtone_player_napi.h
+++ b/interfaces/kits/js/ringtone_manager/include/ringtone_player_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/interfaces/kits/js/ringtone_manager/include/system_sound_manager_napi.h b/interfaces/kits/js/ringtone_manager/include/system_sound_manager_napi.h
index a152a31d..6a2317de 100644
--- a/interfaces/kits/js/ringtone_manager/include/system_sound_manager_napi.h
+++ b/interfaces/kits/js/ringtone_manager/include/system_sound_manager_napi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/sa_profile/3001.xml b/sa_profile/3001.xml
index 43252c0f..9d440997 100644
--- a/sa_profile/3001.xml
+++ b/sa_profile/3001.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2021-2022 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.
diff --git a/sa_profile/3009.xml b/sa_profile/3009.xml
index 16eaee69..98154c98 100644
--- a/sa_profile/3009.xml
+++ b/sa_profile/3009.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2021-2022 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.
diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn
index d1d4f423..994b0a15 100644
--- a/sa_profile/BUILD.gn
+++ b/sa_profile/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/services/BUILD.gn b/services/BUILD.gn
index a630a514..df42ed83 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
@@ -14,8 +14,6 @@
 import("//build/ohos.gni")
 import("//drivers/adapter/uhdf2/uhdf.gni")
 
-samgr_dir = "//foundation/distributedschedule/samgr"
-
 AUDIO_POLICY_SERVER_DIR =
     "//foundation/multimedia/audio_standard/services/src/audio_policy/server"
 
@@ -110,6 +108,7 @@ config("audio_policy_public_config") {
     "//foundation/multimedia/audio_standard/services/include/audio_policy/common",
     "//foundation/multimedia/audio_standard/services/include/audio_policy/server",
     "//foundation/multimedia/audio_standard/services/include/audio_policy/client",
+    "//foundation/multimedia/audio_standard/services/include/audio_bluetooth/client",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include",
@@ -133,34 +132,16 @@ config("audio_policy_public_config") {
   ]
 
   cflags = [
-    "-fPIC",
     "-Wall",
-    "-Wextra",
     "-Werror",
-    "-DGST_DISABLE_DEPRECATED",
-    "-DHAVE_CONFIG_H",
-    "-fno-strict-aliasing",
-    "-Wno-sign-compare",
-    "-Wno-builtin-requires-header",
-    "-Wno-implicit-function-declaration",
-    "-Wno-format",
-    "-Wno-int-conversion",
-    "-Wno-unused-function",
-    "-Wno-unused-parameter",
-    "-Wno-thread-safety-attributes",
-    "-Wno-inconsistent-missing-override",
-    "-fno-rtti",
-    "-fno-exceptions",
-    "-ffunction-sections",
-    "-fdata-sections",
   ]
 
   if (target_cpu == "arm") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
 
-  if (device_name == "baltimore") {
-    cflags += [ "-DDEVICE_BALTIMORE" ]
+  if ("${product_name}" == "m40") {
+    cflags += [ "-DPRODUCT_M40" ]
   }
 
   ldflags = [ "-Wl" ]
@@ -187,9 +168,6 @@ ohos_shared_library("audio_dump") {
 ohos_shared_library("audio_policy_service") {
   install_enable = true
   sources = [
-    "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/src/audio_bluetooth_manager.cpp",
-    "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/src/bluetooth_a2dp_audio_src_observer_stub.cpp",
-    "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/src/bluetooth_a2dp_src_observer.cpp",
     "//foundation/multimedia/audio_standard/services/src/audio_policy/client/audio_device_descriptor.cpp",
     "//foundation/multimedia/audio_standard/services/src/audio_policy/server/audio_policy_manager_listener_proxy.cpp",
     "//foundation/multimedia/audio_standard/services/src/audio_policy/server/audio_policy_manager_stub.cpp",
@@ -211,13 +189,12 @@ ohos_shared_library("audio_policy_service") {
     "$hdf_uhdf_path/host:libhdf_host",
     "$hdf_uhdf_path/ipc:libhdf_ipc_adapter",
     "$hdf_uhdf_path/utils:libhdf_utils",
-    "${samgr_dir}/interfaces/innerkits/common:samgr_common",
-    "${samgr_dir}/interfaces/innerkits/lsamgr:lsamgr",
     "//foundation/communication/bluetooth/services/bluetooth_standard/ipc:btipc_static",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
     "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
     "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
     "//foundation/multimedia/audio_standard/frameworks/native/audioadapter:pulse_audio_service_adapter",
+    "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:audio_bluetooth_client",
     "//foundation/multimedia/audio_standard/services:audio_dump",
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
     "//foundation/multimodalinput/input/frameworks/util:libmmi-util",
@@ -236,10 +213,10 @@ ohos_shared_library("audio_policy_service") {
 }
 
 ohos_prebuilt_etc("audio_policy_config") {
-  if (device_name == "rk3566" || device_name == "rk3568") {
+  if ("${product_name}" == "rk3566" || "${product_name}" == "rk3568") {
     source = "$AUDIO_POLICY_SERVER_DIR/etc/rk3568/audio_policy_config.xml"
-  } else if (device_name == "baltimore") {
-    source = "$AUDIO_POLICY_SERVER_DIR/etc/baltimore/audio_policy_config.xml"
+  } else if ("${product_name}" == "m40") {
+    source = "$AUDIO_POLICY_SERVER_DIR/etc/m40/audio_policy_config.xml"
   } else {
     source = "$AUDIO_POLICY_SERVER_DIR/etc/audio_policy_config.xml"
   }
diff --git a/services/etc/audio_policy.cfg b/services/etc/audio_policy.cfg
index 0c8fa17d..a53ce5f9 100644
--- a/services/etc/audio_policy.cfg
+++ b/services/etc/audio_policy.cfg
@@ -9,8 +9,8 @@
     "services" : [{
             "name" : "audio_policy",
             "path" : ["/system/bin/sa_main", "/system/profile/audio_policy.xml"],
-            "uid" : "system",
-            "gid" : ["system", "shell"],
+            "uid" : "audio",
+            "gid" : ["system", "audio"],
             "disabled" : 1,
             "start-mode" : "condition"
         }
diff --git a/services/etc/audio_policy.rc b/services/etc/audio_policy.rc
index 5238a5a4..fa9144be 100644
--- a/services/etc/audio_policy.rc
+++ b/services/etc/audio_policy.rc
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/services/etc/pulseaudio.cfg b/services/etc/pulseaudio.cfg
index 63a28b30..d8dc720f 100644
--- a/services/etc/pulseaudio.cfg
+++ b/services/etc/pulseaudio.cfg
@@ -4,11 +4,11 @@
             "cmds" : [
                 "rm /data/data/.pulse_dir/runtime/pid",
                 "mkdir /data/data/.pulse_dir",
-                "chown system shell /data/data/.pulse_dir",
+                "chown audio system /data/data/.pulse_dir",
                 "mkdir /data/data/.pulse_dir/runtime",
-                "chown system shell /data/data/.pulse_dir/runtime",
+                "chown audio system /data/data/.pulse_dir/runtime",
                 "mkdir /data/data/.pulse_dir/state",
-                "chown system shell /data/data/.pulse_dir/state",
+                "chown audio system /data/data/.pulse_dir/state",
                 "export PULSE_STATE_PATH /data/data/.pulse_dir/state",
                 "export PULSE_RUNTIME_PATH /data/data/.pulse_dir/runtime",
                 "start pulseaudio",
@@ -19,8 +19,8 @@
     "services" : [{
             "name" : "pulseaudio",
             "path" : ["/system/bin/sa_main", "/system/profile/pulseaudio.xml"],
-            "uid" : "system",
-            "gid" : ["system", "shell"],
+            "uid" : "audio",
+            "gid" : ["system", "audio"],
             "disabled" : 1,
             "start-mode" : "condition"
         }
diff --git a/services/etc/pulseaudio.rc b/services/etc/pulseaudio.rc
index 245aa54d..8a9c14df 100644
--- a/services/etc/pulseaudio.rc
+++ b/services/etc/pulseaudio.rc
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/include/audio_bluetooth_manager.h b/services/include/audio_bluetooth/client/audio_bluetooth_manager.h
similarity index 96%
rename from frameworks/native/audiorenderer/include/audio_bluetooth_manager.h
rename to services/include/audio_bluetooth/client/audio_bluetooth_manager.h
index 7220a1db..8ca2a973 100644
--- a/frameworks/native/audiorenderer/include/audio_bluetooth_manager.h
+++ b/services/include/audio_bluetooth/client/audio_bluetooth_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/include/bluetooth_a2dp_audio_src_observer_stub.h b/services/include/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.h
similarity index 97%
rename from frameworks/native/audiorenderer/include/bluetooth_a2dp_audio_src_observer_stub.h
rename to services/include/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.h
index cbab8f48..ac8f141f 100644
--- a/frameworks/native/audiorenderer/include/bluetooth_a2dp_audio_src_observer_stub.h
+++ b/services/include/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/native/audiorenderer/include/bluetooth_a2dp_src_observer.h b/services/include/audio_bluetooth/client/bluetooth_a2dp_src_observer.h
similarity index 91%
rename from frameworks/native/audiorenderer/include/bluetooth_a2dp_src_observer.h
rename to services/include/audio_bluetooth/client/bluetooth_a2dp_src_observer.h
index 8c95c227..6a38a9ac 100644
--- a/frameworks/native/audiorenderer/include/bluetooth_a2dp_src_observer.h
+++ b/services/include/audio_bluetooth/client/bluetooth_a2dp_src_observer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -21,8 +21,8 @@
 
 class BluetoothA2dpSrcObserver : public OHOS::Bluetooth::BluetoothA2dpAudioSrcObserverStub {
 public:
-    BluetoothA2dpSrcObserver(OHOS::Bluetooth::BtA2dpAudioCallback *callbacks) : callbacks_(callbacks){};
-    ~BluetoothA2dpSrcObserver(){};
+    BluetoothA2dpSrcObserver(OHOS::Bluetooth::BtA2dpAudioCallback *callbacks) : callbacks_(callbacks) { };
+    ~BluetoothA2dpSrcObserver() { };
 
     void OnConnectionStateChanged(const bluetooth::RawAddress &device, int state);
     void OnPlayingStatusChanged(const bluetooth::RawAddress &device, int playingState, int error);
diff --git a/services/include/audio_manager_base.h b/services/include/audio_manager_base.h
index 6983f8cd..a52291a8 100644
--- a/services/include/audio_manager_base.h
+++ b/services/include/audio_manager_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -78,7 +78,7 @@ public:
      * @param  value associated with the key for the audio parameter to be set
      * @return none.
      */
-    virtual void SetAudioParameter(const std::string key, const std::string value) = 0;
+    virtual void SetAudioParameter(const std::string &key, const std::string &value) = 0;
 
     /**
      * Get Audio Parameter.
@@ -86,7 +86,7 @@ public:
      * @param  key for the audio parameter to be set
      * @return Returns value associated to the key requested.
      */
-    virtual const std::string GetAudioParameter(const std::string key) = 0;
+    virtual const std::string GetAudioParameter(const std::string &key) = 0;
 
     /**
      * Update the audio route after device is detected and route is decided
diff --git a/services/include/audio_policy/client/audio_policy_base.h b/services/include/audio_policy/client/audio_policy_base.h
index 86143e79..8a74db7a 100644
--- a/services/include/audio_policy/client/audio_policy_base.h
+++ b/services/include/audio_policy/client/audio_policy_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/client/audio_policy_manager_listener_stub.h b/services/include/audio_policy/client/audio_policy_manager_listener_stub.h
index 59b30cdb..9cc2d7eb 100644
--- a/services/include/audio_policy/client/audio_policy_manager_listener_stub.h
+++ b/services/include/audio_policy/client/audio_policy_manager_listener_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/client/audio_policy_manager_stub.h b/services/include/audio_policy/client/audio_policy_manager_stub.h
index 8e74bc1c..2b825221 100644
--- a/services/include/audio_policy/client/audio_policy_manager_stub.h
+++ b/services/include/audio_policy/client/audio_policy_manager_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/client/audio_policy_proxy.h b/services/include/audio_policy/client/audio_policy_proxy.h
index 591eafb6..6bc8ce18 100644
--- a/services/include/audio_policy/client/audio_policy_proxy.h
+++ b/services/include/audio_policy/client/audio_policy_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/client/audio_ringermode_update_listener_stub.h b/services/include/audio_policy/client/audio_ringermode_update_listener_stub.h
index 155aa637..7f9d6b2f 100644
--- a/services/include/audio_policy/client/audio_ringermode_update_listener_stub.h
+++ b/services/include/audio_policy/client/audio_ringermode_update_listener_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/client/audio_volume_key_event_callback_stub.h b/services/include/audio_policy/client/audio_volume_key_event_callback_stub.h
index c0ec0a16..4c3517cb 100644
--- a/services/include/audio_policy/client/audio_volume_key_event_callback_stub.h
+++ b/services/include/audio_policy/client/audio_volume_key_event_callback_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/common/audio_policy_types.h b/services/include/audio_policy/common/audio_policy_types.h
index dff76699..46f25104 100644
--- a/services/include/audio_policy/common/audio_policy_types.h
+++ b/services/include/audio_policy/common/audio_policy_types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/common/i_audio_volume_key_event_callback.h b/services/include/audio_policy/common/i_audio_volume_key_event_callback.h
index fe68b468..9cf2748b 100644
--- a/services/include/audio_policy/common/i_audio_volume_key_event_callback.h
+++ b/services/include/audio_policy/common/i_audio_volume_key_event_callback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/common/i_standard_audio_policy_manager_listener.h b/services/include/audio_policy/common/i_standard_audio_policy_manager_listener.h
index f81e3abc..2a7cd89e 100644
--- a/services/include/audio_policy/common/i_standard_audio_policy_manager_listener.h
+++ b/services/include/audio_policy/common/i_standard_audio_policy_manager_listener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/common/i_standard_ringermode_update_listener.h b/services/include/audio_policy/common/i_standard_ringermode_update_listener.h
index ca072f19..f0787b5e 100644
--- a/services/include/audio_policy/common/i_standard_ringermode_update_listener.h
+++ b/services/include/audio_policy/common/i_standard_ringermode_update_listener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/server/audio_policy_manager_listener_proxy.h b/services/include/audio_policy/server/audio_policy_manager_listener_proxy.h
index 3807a9e8..63d35c99 100644
--- a/services/include/audio_policy/server/audio_policy_manager_listener_proxy.h
+++ b/services/include/audio_policy/server/audio_policy_manager_listener_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/server/audio_policy_server.h b/services/include/audio_policy/server/audio_policy_server.h
index 4f265b52..dfb86582 100644
--- a/services/include/audio_policy/server/audio_policy_server.h
+++ b/services/include/audio_policy/server/audio_policy_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -128,6 +128,10 @@ private:
     static constexpr int32_t MIN_VOLUME_LEVEL = 0;
     static constexpr int32_t CONST_FACTOR = 100;
     static constexpr int32_t VOLUME_CHANGE_FACTOR = 1;
+    static constexpr int32_t FIRST_PRIORITY = 1;
+    static constexpr int32_t SECOND_PRIORITY = 2;
+    static constexpr int32_t THIRD_PRIORITY = 3;
+    static constexpr int32_t VOLUME_KEY_DURATION = 0;
 };
 } // namespace AudioStandard
 } // namespace OHOS
diff --git a/services/include/audio_policy/server/audio_ringermode_update_listener_proxy.h b/services/include/audio_policy/server/audio_ringermode_update_listener_proxy.h
index c0cfeee4..2d8f152a 100644
--- a/services/include/audio_policy/server/audio_ringermode_update_listener_proxy.h
+++ b/services/include/audio_policy/server/audio_ringermode_update_listener_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_policy/server/audio_service_dump.h b/services/include/audio_policy/server/audio_service_dump.h
index 0c5fd7ba..50edd533 100644
--- a/services/include/audio_policy/server/audio_service_dump.h
+++ b/services/include/audio_policy/server/audio_service_dump.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -25,6 +25,7 @@
 #include <map>
 #include "securec.h"
 #include "media_log.h"
+#include "nocopyable.h"
 
 namespace OHOS {
 namespace AudioStandard {
@@ -88,6 +89,8 @@ typedef struct {
 
 class AudioServiceDump : public AudioTimer {
 public:
+    DISALLOW_COPY_AND_MOVE(AudioServiceDump);
+
     AudioServiceDump();
     ~AudioServiceDump();
     int32_t Initialize();
diff --git a/services/include/audio_policy/server/audio_volume_key_event_callback_proxy.h b/services/include/audio_policy/server/audio_volume_key_event_callback_proxy.h
index 00d64853..c4f22b46 100644
--- a/services/include/audio_policy/server/audio_volume_key_event_callback_proxy.h
+++ b/services/include/audio_policy/server/audio_volume_key_event_callback_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_service/client/audio_error.h b/services/include/audio_service/client/audio_error.h
index 0a4a5f24..4c043fd3 100644
--- a/services/include/audio_service/client/audio_error.h
+++ b/services/include/audio_service/client/audio_error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_service/client/audio_manager_proxy.h b/services/include/audio_service/client/audio_manager_proxy.h
index d4764eee..4163ee38 100644
--- a/services/include/audio_service/client/audio_manager_proxy.h
+++ b/services/include/audio_service/client/audio_manager_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -32,8 +32,8 @@ public:
     bool IsMicrophoneMute() override;
     int32_t SetAudioScene(AudioScene audioScene) override;
     std::vector<sptr<AudioDeviceDescriptor>> GetDevices(DeviceFlag deviceFlag) override;
-    const std::string GetAudioParameter(const std::string key) override;
-    void SetAudioParameter(const std::string key, const std::string value) override;
+    const std::string GetAudioParameter(const std::string &key) override;
+    void SetAudioParameter(const std::string &key, const std::string &value) override;
     int32_t UpdateActiveDeviceRoute(DeviceType type, DeviceFlag flag) override;
     const char *RetrieveCookie(int32_t &size) override;
 private:
diff --git a/services/include/audio_service/client/audio_ringtone_manager.h b/services/include/audio_service/client/audio_ringtone_manager.h
index 93088031..7cb04c3c 100644
--- a/services/include/audio_service/client/audio_ringtone_manager.h
+++ b/services/include/audio_service/client/audio_ringtone_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_service/client/audio_server_death_recipient.h b/services/include/audio_service/client/audio_server_death_recipient.h
index 9cb3bf4c..6930af83 100644
--- a/services/include/audio_service/client/audio_server_death_recipient.h
+++ b/services/include/audio_service/client/audio_server_death_recipient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_service/client/audio_service_client.h b/services/include/audio_service/client/audio_service_client.h
index 8d41ca4e..8df58095 100644
--- a/services/include/audio_service/client/audio_service_client.h
+++ b/services/include/audio_service/client/audio_service_client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -156,7 +156,7 @@ public:
      *
      * @return Returns unique session ID for the created session
     */
-    int32_t GetSessionID(uint32_t &sessionID);
+    int32_t GetSessionID(uint32_t &sessionID) const;
 
     /**
     * Starts the stream created using CreateStream
@@ -264,7 +264,7 @@ public:
     * @param timeStamp will be filled up with current timestamp
     * @return Returns {@code 0} if success; returns {@code -1} otherwise.
     */
-    int32_t GetCurrentTimeStamp(uint64_t &timeStamp);
+    int32_t GetCurrentTimeStamp(uint64_t &timeStamp) const;
 
     /**
     * Provides the current latency for playback/record stream created using CreateStream
@@ -272,7 +272,7 @@ public:
     * @param latency will be filled up with the current latency in microseconds
     * @return Returns {@code 0} if success; returns {@code -1} otherwise.
     */
-    int32_t GetAudioLatency(uint64_t &latency);
+    int32_t GetAudioLatency(uint64_t &latency) const;
 
     /**
     * Provides the playback/record stream parameters created using CreateStream
@@ -280,7 +280,7 @@ public:
     * @param audioParams will be filled up with stream audio parameters
     * @return Returns {@code 0} if success; returns {@code -1} otherwise.
     */
-    int32_t GetAudioStreamParams(AudioStreamParams &audioParams);
+    int32_t GetAudioStreamParams(AudioStreamParams &audioParams) const;
 
     /**
     * Provides the minimum buffer size required for this audio stream
@@ -288,7 +288,7 @@ public:
     * @param minBufferSize will be set to minimum buffer size in bytes
     * @return Returns {@code 0} if success; returns {@code -1} otherwise.
     */
-    int32_t GetMinimumBufferSize(size_t &minBufferSize);
+    int32_t GetMinimumBufferSize(size_t &minBufferSize) const;
 
     /**
     * Provides the minimum frame count required for this audio stream
@@ -296,7 +296,7 @@ public:
     * @param frameCount will be set to minimum number of frames
     * @return Returns {@code 0} if success; returns {@code -1} otherwise.
     */
-    int32_t GetMinimumFrameCount(uint32_t &frameCount);
+    int32_t GetMinimumFrameCount(uint32_t &frameCount) const;
 
     /**
     * Provides the sampling rate for the active audio stream
@@ -304,7 +304,7 @@ public:
     *
     * @return Returns sampling rate in Hz
     */
-    uint32_t GetSamplingRate();
+    uint32_t GetSamplingRate() const;
 
     /**
     * Provides the channel count for the active audio stream
@@ -312,7 +312,7 @@ public:
     *
     * @return Returns number of channels
     */
-    uint8_t GetChannelCount();
+    uint8_t GetChannelCount() const;
 
     /**
     * Provides the sample size for the active audio stream
@@ -320,7 +320,7 @@ public:
     *
     * @return Returns sample size in number of bits
     */
-    uint8_t GetSampleSize();
+    uint8_t GetSampleSize() const;
 
     // Device volume & route handling APIs
 
diff --git a/services/include/audio_service/client/audio_timer.h b/services/include/audio_service/client/audio_timer.h
index 3565df53..c2669b1e 100644
--- a/services/include/audio_service/client/audio_timer.h
+++ b/services/include/audio_service/client/audio_timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/include/audio_service/server/audio_server.h b/services/include/audio_service/server/audio_server.h
index 4792933e..6200a471 100644
--- a/services/include/audio_service/server/audio_server.h
+++ b/services/include/audio_service/server/audio_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -42,8 +42,8 @@ public:
     int32_t SetAudioScene(AudioScene audioScene) override;
     std::vector<sptr<AudioDeviceDescriptor>> GetDevices(DeviceFlag deviceFlag) override;
     static void *paDaemonThread(void *arg);
-    void SetAudioParameter(const std::string key, const std::string value) override;
-    const std::string GetAudioParameter(const std::string key) override;
+    void SetAudioParameter(const std::string &key, const std::string &value) override;
+    const std::string GetAudioParameter(const std::string &key) override;
     const char *RetrieveCookie(int32_t &size) override;
     int32_t UpdateActiveDeviceRoute(DeviceType type, DeviceFlag flag) override;
 private:
diff --git a/frameworks/native/audiorenderer/src/audio_bluetooth_manager.cpp b/services/src/audio_bluetooth/client/audio_bluetooth_manager.cpp
similarity index 97%
rename from frameworks/native/audiorenderer/src/audio_bluetooth_manager.cpp
rename to services/src/audio_bluetooth/client/audio_bluetooth_manager.cpp
index 1928263d..8e504014 100644
--- a/frameworks/native/audiorenderer/src/audio_bluetooth_manager.cpp
+++ b/services/src/audio_bluetooth/client/audio_bluetooth_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -68,6 +68,7 @@ static void AudioOnConnectionChanged(const RawAddress &device, int state)
 
 static BtA2dpAudioCallback g_hdiCallacks = {
     .OnPlayingStatusChanged = AudioOnPlayingStatusChanged,
+    .OnConfigurationChanged = AudioOnConfigurationChanged,
     .OnConnectionStateChanged = AudioOnConnectionChanged,
 };
 
diff --git a/frameworks/native/audiorenderer/src/bluetooth_a2dp_audio_src_observer_stub.cpp b/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp
similarity index 89%
rename from frameworks/native/audiorenderer/src/bluetooth_a2dp_audio_src_observer_stub.cpp
rename to services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp
index 0ec34d9c..9e9820cf 100644
--- a/frameworks/native/audiorenderer/src/bluetooth_a2dp_audio_src_observer_stub.cpp
+++ b/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -45,11 +45,8 @@ int BluetoothA2dpAudioSrcObserverStub::OnRemoteRequest(
 {
     HILOGD("BluetoothA2dpAudioSrcObserverStub::OnRemoteRequest, cmd = %{public}d, flags = %{public}d",
         code, option.GetFlags());
-    std::u16string descriptor = BluetoothA2dpAudioSrcObserverStub::GetDescriptor();
-    std::u16string remoteDescriptor = data.ReadInterfaceToken();
-    if (descriptor != remoteDescriptor) {
-        HILOGI("local descriptor is not equal to remote, descriptor: %{public}s, remoteDescriptor:%{public}s",
-            descriptor.c_str(), remoteDescriptor.c_str());
+    if (data.ReadInterfaceToken() != BluetoothA2dpAudioSrcObserverStub::GetDescriptor()) {
+        HILOGE("BluetoothA2dpAudioSrcObserverStub: ReadInterfaceToken failed");
         return ERR_INVALID_STATE;
     }
     auto itFunc = memberFuncMap_.find(code);
diff --git a/frameworks/native/audiorenderer/src/bluetooth_a2dp_src_observer.cpp b/services/src/audio_bluetooth/client/bluetooth_a2dp_src_observer.cpp
similarity index 97%
rename from frameworks/native/audiorenderer/src/bluetooth_a2dp_src_observer.cpp
rename to services/src/audio_bluetooth/client/bluetooth_a2dp_src_observer.cpp
index 2ea575d4..71e6f2d4 100644
--- a/frameworks/native/audiorenderer/src/bluetooth_a2dp_src_observer.cpp
+++ b/services/src/audio_bluetooth/client/bluetooth_a2dp_src_observer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/client/audio_device_descriptor.cpp b/services/src/audio_policy/client/audio_device_descriptor.cpp
index 3d5b1c5c..ddb8bd04 100644
--- a/services/src/audio_policy/client/audio_device_descriptor.cpp
+++ b/services/src/audio_policy/client/audio_device_descriptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/client/audio_policy_manager.cpp b/services/src/audio_policy/client/audio_policy_manager.cpp
index 297c4417..70ba93f0 100644
--- a/services/src/audio_policy/client/audio_policy_manager.cpp
+++ b/services/src/audio_policy/client/audio_policy_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -29,23 +29,16 @@ bool AudioPolicyManager::serverConnected = false;
 void AudioPolicyManager::Init()
 {
     auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
-    if (samgr == nullptr) {
-        MEDIA_ERR_LOG("AudioPolicyManager::init failed");
-        return;
-    }
+    CHECK_AND_RETURN_LOG(samgr != nullptr, "AudioPolicyManager::init failed");
 
     sptr<IRemoteObject> object = samgr->GetSystemAbility(AUDIO_POLICY_SERVICE_ID);
-    if (object == nullptr) {
-        MEDIA_DEBUG_LOG("AudioPolicyManager::object is NULL.");
-    }
+    CHECK_AND_RETURN_LOG(object != nullptr, "AudioPolicyManager::object is NULL.");
 
     g_sProxy = iface_cast<IAudioPolicy>(object);
-    if (g_sProxy == nullptr) {
-        MEDIA_DEBUG_LOG("AudioPolicyManager::init g_sProxy is NULL.");
-    } else {
-        serverConnected = true;
-        MEDIA_DEBUG_LOG("AudioPolicyManager::init g_sProxy is assigned.");
-    }
+    CHECK_AND_RETURN_LOG(g_sProxy != nullptr, "AudioPolicyManager::init g_sProxy is NULL.");
+
+    serverConnected = true;
+    MEDIA_DEBUG_LOG("AudioPolicyManager::init g_sProxy is assigned.");
 
     RegisterAudioPolicyServerDeathRecipient();
 }
@@ -57,7 +50,11 @@ void AudioPolicyManager::RegisterAudioPolicyServerDeathRecipient()
     sptr<AudioServerDeathRecipient> deathRecipient_ = new(std::nothrow) AudioServerDeathRecipient(pid);
     if (deathRecipient_ != nullptr) {
         auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
+        CHECK_AND_RETURN_LOG(samgr != nullptr, "Failed to obtain samgr");
+
         sptr<IRemoteObject> object = samgr->GetSystemAbility(OHOS::AUDIO_POLICY_SERVICE_ID);
+        CHECK_AND_RETURN_LOG(object != nullptr, "Policy service unavailable");
+
         deathRecipient_->SetNotifyCb(std::bind(&AudioPolicyManager::AudioPolicyServerDied, this,
                                                std::placeholders::_1));
         bool result = object->AddDeathRecipient(deathRecipient_);
diff --git a/services/src/audio_policy/client/audio_policy_manager_listener_stub.cpp b/services/src/audio_policy/client/audio_policy_manager_listener_stub.cpp
index 560f336e..1cbe34b8 100644
--- a/services/src/audio_policy/client/audio_policy_manager_listener_stub.cpp
+++ b/services/src/audio_policy/client/audio_policy_manager_listener_stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -76,7 +76,7 @@ int AudioPolicyManagerListenerStub::OnRemoteRequest(
             return MEDIA_OK;
         }
         case ON_DEVICE_CHANGED: {
-            MEDIA_INFO_LOG("Device chnage callback received");
+            MEDIA_INFO_LOG("Device change callback received");
             DeviceChangeAction deviceChangeAction = {};
 
             ReadAudioDeviceChangeData(data, deviceChangeAction);
diff --git a/services/src/audio_policy/client/audio_policy_proxy.cpp b/services/src/audio_policy/client/audio_policy_proxy.cpp
index d98d6ea8..e34f3a83 100644
--- a/services/src/audio_policy/client/audio_policy_proxy.cpp
+++ b/services/src/audio_policy/client/audio_policy_proxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp b/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp
index 6a3434c1..8c954250 100644
--- a/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp
+++ b/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp b/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp
index dc71ebf5..3a804e8d 100644
--- a/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp
+++ b/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/audio_policy_manager_listener_proxy.cpp b/services/src/audio_policy/server/audio_policy_manager_listener_proxy.cpp
index 257e2eda..387d1339 100644
--- a/services/src/audio_policy/server/audio_policy_manager_listener_proxy.cpp
+++ b/services/src/audio_policy/server/audio_policy_manager_listener_proxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -92,7 +92,7 @@ AudioPolicyManagerListenerCallback::AudioPolicyManagerListenerCallback(
 
 AudioPolicyManagerListenerCallback::~AudioPolicyManagerListenerCallback()
 {
-    MEDIA_DEBUG_LOG("AudioPolicyManagerListenerCallback: Instance destory");
+    MEDIA_DEBUG_LOG("AudioPolicyManagerListenerCallback: Instance destroy");
 }
 
 void AudioPolicyManagerListenerCallback::OnInterrupt(const InterruptEventInternal &interruptEvent)
diff --git a/services/src/audio_policy/server/audio_policy_manager_stub.cpp b/services/src/audio_policy/server/audio_policy_manager_stub.cpp
index 649bcce7..d23d5634 100644
--- a/services/src/audio_policy/server/audio_policy_manager_stub.cpp
+++ b/services/src/audio_policy/server/audio_policy_manager_stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/audio_policy_server.cpp b/services/src/audio_policy/server/audio_policy_server.cpp
index be8a7e1e..bc25e335 100644
--- a/services/src/audio_policy/server/audio_policy_server.cpp
+++ b/services/src/audio_policy/server/audio_policy_server.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -49,9 +49,9 @@ AudioPolicyServer::AudioPolicyServer(int32_t systemAbilityId, bool runOnCreate)
         MEDIA_DEBUG_LOG("AudioPolicyServer: SetAudioSessionCallback failed");
     }
 
-    interruptPriorityMap_[STREAM_VOICE_CALL] = 3;
-    interruptPriorityMap_[STREAM_RING] = 2;
-    interruptPriorityMap_[STREAM_MUSIC] = 1;
+    interruptPriorityMap_[STREAM_VOICE_CALL] = THIRD_PRIORITY;
+    interruptPriorityMap_[STREAM_RING] = SECOND_PRIORITY;
+    interruptPriorityMap_[STREAM_MUSIC] = FIRST_PRIORITY;
 }
 
 void AudioPolicyServer::OnDump()
@@ -114,7 +114,10 @@ void AudioPolicyServer::RegisterAudioServerDeathRecipient()
     sptr<AudioServerDeathRecipient> deathRecipient_ = new(std::nothrow) AudioServerDeathRecipient(pid);
     if (deathRecipient_ != nullptr) {
         auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
+        CHECK_AND_RETURN_LOG(samgr != nullptr, "Failed to obtain system ability manager");
         sptr<IRemoteObject> object = samgr->GetSystemAbility(OHOS::AUDIO_DISTRIBUTED_SERVICE_ID);
+        CHECK_AND_RETURN_LOG(object != nullptr, "Audio service unavailable");
+
         deathRecipient_->SetNotifyCb(std::bind(&AudioPolicyServer::AudioServerDied, this, std::placeholders::_1));
         bool result = object->AddDeathRecipient(deathRecipient_);
         if (!result) {
@@ -125,20 +128,22 @@ void AudioPolicyServer::RegisterAudioServerDeathRecipient()
 
 void AudioPolicyServer::AudioServerDied(pid_t pid)
 {
-    MEDIA_INFO_LOG("Audio server died: restart policy server");
-    MEDIA_INFO_LOG("AudioPolicyServer: Kill pid:%{public}d", pid);
+    MEDIA_INFO_LOG("Audio server died: restart policy server pid %{public}d", pid);
     kill(pid, SIGKILL);
 }
 
 void AudioPolicyServer::SubscribeKeyEvents()
 {
     MMI::InputManager *im = MMI::InputManager::GetInstance();
+    CHECK_AND_RETURN_LOG(im != nullptr, "Failed to obtain INPUT manager");
+
     std::set<int32_t> preKeys;
     std::shared_ptr<OHOS::MMI::KeyOption> keyOption_down = std::make_shared<OHOS::MMI::KeyOption>();
+    CHECK_AND_RETURN_LOG(keyOption_down != nullptr, "Invalid key option");
     keyOption_down->SetPreKeys(preKeys);
     keyOption_down->SetFinalKey(OHOS::MMI::KeyEvent::KEYCODE_VOLUME_DOWN);
     keyOption_down->SetFinalKeyDown(true);
-    keyOption_down->SetFinalKeyDownDuration(0);
+    keyOption_down->SetFinalKeyDownDuration(VOLUME_KEY_DURATION);
     im->SubscribeKeyEvent(keyOption_down, [=](std::shared_ptr<MMI::KeyEvent> keyEventCallBack) {
         std::lock_guard<std::mutex> lock(volumeKeyEventMutex_);
         AudioStreamType streamInFocus = GetStreamInFocus();
@@ -483,7 +488,7 @@ bool AudioPolicyServer::ProcessCurActiveInterrupt(std::list<AudioInterrupt>::ite
 int32_t AudioPolicyServer::ProcessFocusEntry(const AudioInterrupt &incomingInterrupt)
 {
     // Function: First Process pendingList and remove session that loses focus indefinitely
-    for (auto iterPending = pendingOwnersList_.begin(); iterPending != pendingOwnersList_.end(); ) {
+    for (auto iterPending = pendingOwnersList_.begin(); iterPending != pendingOwnersList_.end();) {
         bool IsIterPendingErased = ProcessPendingInterrupt(iterPending, incomingInterrupt);
         if (!IsIterPendingErased) {
             MEDIA_INFO_LOG("AudioPolicyServer: iterPending not erased while processing ++increment it");
@@ -493,7 +498,7 @@ int32_t AudioPolicyServer::ProcessFocusEntry(const AudioInterrupt &incomingInter
 
     auto focusTable = mPolicyService.GetAudioFocusTable();
     // Function: Process Focus entry
-    for (auto iterActive = curActiveOwnersList_.begin(); iterActive != curActiveOwnersList_.end(); ) {
+    for (auto iterActive = curActiveOwnersList_.begin(); iterActive != curActiveOwnersList_.end();) {
         AudioStreamType activeStreamType = iterActive->streamType;
         AudioStreamType incomingStreamType = incomingInterrupt.streamType;
         AudioFocusEntry focusEntry = focusTable[activeStreamType][incomingStreamType];
@@ -520,7 +525,7 @@ void AudioPolicyServer::AddToCurActiveList(const AudioInterrupt &audioInterrupt)
 
     auto itCurActive = curActiveOwnersList_.begin();
 
-    for ( ; itCurActive != curActiveOwnersList_.end(); ++itCurActive) {
+    for (; itCurActive != curActiveOwnersList_.end(); ++itCurActive) {
         AudioStreamType existingPriorityStreamType = itCurActive->streamType;
         if (interruptPriorityMap_[existingPriorityStreamType] > interruptPriorityMap_[audioInterrupt.streamType]) {
             continue;
@@ -624,7 +629,7 @@ void AudioPolicyServer::ResumeUnduckPendingList(const AudioInterrupt &exitInterr
     InterruptEventInternal forcedUnducking {INTERRUPT_TYPE_END, INTERRUPT_FORCE, INTERRUPT_HINT_UNDUCK, 0.2f};
     InterruptEventInternal resumeForcePaused {INTERRUPT_TYPE_END, INTERRUPT_FORCE, INTERRUPT_HINT_RESUME, 0.2f};
 
-    for (auto it = pendingOwnersList_.begin(); it != pendingOwnersList_.end(); ) {
+    for (auto it = pendingOwnersList_.begin(); it != pendingOwnersList_.end();) {
         AudioStreamType pendingStreamType = it->streamType;
         uint32_t pendingSessionID = it->sessionID;
         if (interruptPriorityMap_[pendingStreamType] > interruptPriorityMap_[exitStreamType]) {
@@ -671,7 +676,7 @@ int32_t AudioPolicyServer::DeactivateAudioInterrupt(const AudioInterrupt &audioI
     bool isInterruptActive = false;
     InterruptEventInternal forcedUnducking {INTERRUPT_TYPE_END, INTERRUPT_FORCE, INTERRUPT_HINT_UNDUCK, 0.2f};
     std::shared_ptr<AudioInterruptCallback> policyListenerCb = nullptr;
-    for (auto it = curActiveOwnersList_.begin(); it != curActiveOwnersList_.end(); ) {
+    for (auto it = curActiveOwnersList_.begin(); it != curActiveOwnersList_.end();) {
         if (it->sessionID == audioInterrupt.sessionID) {
             policyListenerCb = policyListenerCbsMap_[it->sessionID];
             if (policyListenerCb != nullptr) {
diff --git a/services/src/audio_policy/server/audio_ringermode_update_listener_proxy.cpp b/services/src/audio_policy/server/audio_ringermode_update_listener_proxy.cpp
index 31412be0..6e6897b9 100644
--- a/services/src/audio_policy/server/audio_ringermode_update_listener_proxy.cpp
+++ b/services/src/audio_policy/server/audio_ringermode_update_listener_proxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -55,7 +55,7 @@ AudioRingerModeListenerCallback::AudioRingerModeListenerCallback(
 
 AudioRingerModeListenerCallback::~AudioRingerModeListenerCallback()
 {
-    MEDIA_DEBUG_LOG("AudioRingerModeListenerCallback: Instance destory");
+    MEDIA_DEBUG_LOG("AudioRingerModeListenerCallback: Instance destroy");
 }
 
 void AudioRingerModeListenerCallback::OnRingerModeUpdated(const AudioRingerMode &ringerMode)
diff --git a/services/src/audio_policy/server/audio_service_dump.cpp b/services/src/audio_policy/server/audio_service_dump.cpp
index b380528b..2ff90453 100644
--- a/services/src/audio_policy/server/audio_service_dump.cpp
+++ b/services/src/audio_policy/server/audio_service_dump.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -19,13 +19,13 @@ using namespace std;
 
 namespace OHOS {
 namespace AudioStandard {
-AudioServiceDump::AudioServiceDump()
+AudioServiceDump::AudioServiceDump() : mainLoop(nullptr),
+                                       api(nullptr),
+                                       context(nullptr),
+                                       isMainLoopStarted(false),
+                                       isContextConnected(false)
 {
-    isMainLoopStarted = false;
-    isContextConnected = false;
-    mainLoop = NULL;
-    context  = NULL;
-    api = NULL;
+    MEDIA_DEBUG_LOG("AudioServiceDump ctor");
 }
 
 AudioServiceDump::~AudioServiceDump()
@@ -36,48 +36,52 @@ AudioServiceDump::~AudioServiceDump()
 void AudioServiceDump::ResetPAAudioDump()
 {
     lock_guard<mutex> lock(ctrlMutex);
-    if (mainLoop && (isMainLoopStarted == true))
+    if (mainLoop && (isMainLoopStarted == true)) {
         pa_threaded_mainloop_stop(mainLoop);
+    }
 
     if (context) {
-        pa_context_set_state_callback(context, NULL, NULL);
-        if (isContextConnected == true)
+        pa_context_set_state_callback(context, nullptr, nullptr);
+        if (isContextConnected == true) {
             pa_context_disconnect(context);
+        }
         pa_context_unref(context);
     }
 
-    if (mainLoop)
+    if (mainLoop) {
         pa_threaded_mainloop_free(mainLoop);
+    }
 
     isMainLoopStarted  = false;
     isContextConnected = false;
-    mainLoop = NULL;
-    context  = NULL;
-    api      = NULL;
+    mainLoop = nullptr;
+    context  = nullptr;
+    api      = nullptr;
 }
 
 int32_t AudioServiceDump::Initialize()
 {
     int error = PA_ERR_INTERNAL;
     mainLoop = pa_threaded_mainloop_new();
-    if (mainLoop == NULL)
+    if (mainLoop == nullptr) {
         return AUDIO_DUMP_INIT_ERR;
+    }
 
     api = pa_threaded_mainloop_get_api(mainLoop);
-    if (api == NULL) {
+    if (api == nullptr) {
         ResetPAAudioDump();
         return AUDIO_DUMP_INIT_ERR;
     }
 
     context = pa_context_new(api, "AudioServiceDump");
-    if (context == NULL) {
+    if (context == nullptr) {
         ResetPAAudioDump();
         return AUDIO_DUMP_INIT_ERR;
     }
 
     pa_context_set_state_callback(context, PAContextStateCb, mainLoop);
 
-    if (pa_context_connect(context, NULL, PA_CONTEXT_NOFAIL, NULL) < 0) {
+    if (pa_context_connect(context, nullptr, PA_CONTEXT_NOFAIL, nullptr) < 0) {
         error = pa_context_errno(context);
         MEDIA_ERR_LOG("context connect error: %{public}s", pa_strerror(error));
         ResetPAAudioDump();
@@ -97,8 +101,9 @@ int32_t AudioServiceDump::Initialize()
     isMainLoopStarted = true;
     while (true) {
         pa_context_state_t state = pa_context_get_state(context);
-        if (state == PA_CONTEXT_READY)
+        if (state == PA_CONTEXT_READY) {
             break;
+        }
 
         if (!PA_CONTEXT_IS_GOOD(state)) {
             error = pa_context_errno(context);
@@ -127,9 +132,8 @@ bool AudioServiceDump::IsEndWith(const std::string &mainStr, const std::string &
     if (mainStr.size() >= toMatch.size() &&
         mainStr.compare(mainStr.size() - toMatch.size(), toMatch.size(), toMatch) == 0) {
         return true;
-    } else {
-        return false;
     }
+    return false;
 }
 
 bool AudioServiceDump::IsValidModule(const std::string moduleName)
@@ -462,13 +466,13 @@ void AudioServiceDump::DataDump(string &dumpString)
 
 void AudioServiceDump::AudioDataDump(PolicyData &policyData, string &dumpString)
 {
-    if (mainLoop == NULL || context == NULL) {
+    if (mainLoop == nullptr || context == nullptr) {
         MEDIA_ERR_LOG("Audio Service Not running");
         return;
     }
 
     pa_threaded_mainloop_lock(mainLoop);
-    pa_operation *operation = NULL;
+    pa_operation *operation = nullptr;
     operation = pa_context_get_sink_info_list(context, AudioServiceDump::PASinkInfoCallback, (void *)(this));
 
     while (pa_operation_get_state(operation) == PA_OPERATION_RUNNING) {
@@ -530,6 +534,11 @@ void AudioServiceDump::PAContextStateCb(pa_context *context, void *userdata)
 void AudioServiceDump::PASinkInfoCallback(pa_context *c, const pa_sink_info *i, int eol, void *userdata)
 {
     AudioServiceDump *asDump = (AudioServiceDump *)userdata;
+    if (asDump == nullptr) {
+        MEDIA_ERR_LOG("Failed to get sink information");
+        return;
+    }
+
     pa_threaded_mainloop *mainLoop = (pa_threaded_mainloop *)asDump->mainLoop;
 
     if (eol < 0) {
@@ -544,7 +553,7 @@ void AudioServiceDump::PASinkInfoCallback(pa_context *c, const pa_sink_info *i,
 
     SinkSourceInfo sinkInfo;
 
-    if (i->name != NULL) {
+    if (i->name != nullptr) {
         string sinkName(i->name);
         if (IsValidModule(sinkName)) {
             (sinkInfo.name).assign(sinkName);
@@ -557,6 +566,11 @@ void AudioServiceDump::PASinkInfoCallback(pa_context *c, const pa_sink_info *i,
 void AudioServiceDump::PASinkInputInfoCallback(pa_context *c, const pa_sink_input_info *i, int eol, void *userdata)
 {
     AudioServiceDump *asDump = (AudioServiceDump *)userdata;
+    if (asDump == nullptr) {
+        MEDIA_ERR_LOG("Failed to get sink input information");
+        return;
+    }
+
     pa_threaded_mainloop *mainLoop = (pa_threaded_mainloop *)asDump->mainLoop;
 
     if (eol < 0) {
@@ -574,36 +588,36 @@ void AudioServiceDump::PASinkInputInfoCallback(pa_context *c, const pa_sink_inpu
     sinkInputInfo.sampleSpec = i->sample_spec;
     sinkInputInfo.corked = i->corked;
 
-    if (i->proplist !=NULL) {
+    if (i->proplist !=nullptr) {
         const char *applicationname = pa_proplist_gets(i->proplist, "application.name");
         const char *processid = pa_proplist_gets(i->proplist, "application.process.id");
         const char *user = pa_proplist_gets(i->proplist, "application.process.user");
         const char *sessionid = pa_proplist_gets(i->proplist, "stream.sessionID");
         const char *sessionstarttime = pa_proplist_gets(i->proplist, "stream.startTime");
 
-        if (applicationname != NULL) {
+        if (applicationname != nullptr) {
             string applicationName(applicationname);
             (sinkInputInfo.applicationName).assign(applicationName);
         }
         
-        if (processid != NULL) {
+        if (processid != nullptr) {
             string processId(processid);
             (sinkInputInfo.processId).assign(processId);
         }
       
-        if (user != NULL) {
+        if (user != nullptr) {
             struct passwd *p;
-            if ((p = getpwnam(user)) != NULL) {
+            if ((p = getpwnam(user)) != nullptr) {
                 sinkInputInfo.userId = uint32_t(p->pw_uid);
             }
         }
 
-        if (sessionid != NULL) {
+        if (sessionid != nullptr) {
             string sessionId(sessionid);
             (sinkInputInfo.sessionId).assign(sessionId);
         }
 
-        if (sessionstarttime != NULL) {
+        if (sessionstarttime != nullptr) {
             string sessionStartTime(sessionstarttime);
             (sinkInputInfo.sessionStartTime).assign(sessionStartTime);
         }
@@ -614,6 +628,11 @@ void AudioServiceDump::PASinkInputInfoCallback(pa_context *c, const pa_sink_inpu
 void AudioServiceDump::PASourceInfoCallback(pa_context *c, const pa_source_info *i, int eol, void *userdata)
 {
     AudioServiceDump *asDump = (AudioServiceDump *)userdata;
+    if (asDump == nullptr) {
+        MEDIA_ERR_LOG("Failed to get source information");
+        return;
+    }
+
     pa_threaded_mainloop *mainLoop = (pa_threaded_mainloop *)asDump->mainLoop;
 
     if (eol < 0) {
@@ -628,7 +647,7 @@ void AudioServiceDump::PASourceInfoCallback(pa_context *c, const pa_source_info
 
     SinkSourceInfo sourceInfo;
 
-    if (i->name != NULL) {
+    if (i->name != nullptr) {
         string sourceName(i->name);
         if (IsValidModule(sourceName)) {
             (sourceInfo.name).assign(sourceName);
@@ -642,6 +661,11 @@ void AudioServiceDump::PASourceOutputInfoCallback(pa_context *c, const pa_source
     void *userdata)
 {
     AudioServiceDump *asDump = (AudioServiceDump *)userdata;
+    if (asDump == nullptr) {
+        MEDIA_ERR_LOG("Failed to get source output information");
+        return;
+    }
+
     pa_threaded_mainloop *mainLoop = (pa_threaded_mainloop *)asDump->mainLoop;
 
     if (eol < 0) {
@@ -658,36 +682,36 @@ void AudioServiceDump::PASourceOutputInfoCallback(pa_context *c, const pa_source
     sourceOutputInfo.sampleSpec = i->sample_spec;
     sourceOutputInfo.corked = i->corked;
 
-    if (i->proplist !=NULL) {
+    if (i->proplist !=nullptr) {
         const char *applicationname = pa_proplist_gets(i->proplist, "application.name");
         const char *processid = pa_proplist_gets(i->proplist, "application.process.id");
         const char *user = pa_proplist_gets(i->proplist, "application.process.user");
         const char *sessionid = pa_proplist_gets(i->proplist, "stream.sessionID");
         const char *sessionstarttime = pa_proplist_gets(i->proplist, "stream.startTime");
         
-        if (applicationname != NULL) {
+        if (applicationname != nullptr) {
             string applicationName(applicationname);
             (sourceOutputInfo.applicationName).assign(applicationName);
         }
         
-        if (processid != NULL) {
+        if (processid != nullptr) {
             string processId(processid);
             (sourceOutputInfo.processId).assign(processId);
         }
 
-        if (user != NULL) {
+        if (user != nullptr) {
             struct passwd *p;
-            if ((p = getpwnam(user)) != NULL) {
+            if ((p = getpwnam(user)) != nullptr) {
                 sourceOutputInfo.userId = uint32_t(p->pw_uid);
             }
         }
         
-        if (sessionid != NULL) {
+        if (sessionid != nullptr) {
             string sessionId(sessionid);
             (sourceOutputInfo.sessionId).assign(sessionId);
         }
 
-        if (sessionstarttime != NULL) {
+        if (sessionstarttime != nullptr) {
             string sessionStartTime(sessionstarttime);
             (sourceOutputInfo.sessionStartTime).assign(sessionStartTime);
         }
diff --git a/services/src/audio_policy/server/audio_volume_key_event_callback_proxy.cpp b/services/src/audio_policy/server/audio_volume_key_event_callback_proxy.cpp
index 6b2da44b..aa75fe12 100644
--- a/services/src/audio_policy/server/audio_volume_key_event_callback_proxy.cpp
+++ b/services/src/audio_policy/server/audio_volume_key_event_callback_proxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/etc/audio_interrupt_policy_config.xml b/services/src/audio_policy/server/etc/audio_interrupt_policy_config.xml
index 6eec44a9..cd3a18d4 100644
--- a/services/src/audio_policy/server/etc/audio_interrupt_policy_config.xml
+++ b/services/src/audio_policy/server/etc/audio_interrupt_policy_config.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (c) 2021-2022 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.
+-->
 <!-- Focus policies to fallback to, incase of unknown usecases */ -->
 <audio_focus_policy>
     <stream_type value="STREAM_MUSIC">
diff --git a/services/src/audio_policy/server/etc/audio_policy_config.xml b/services/src/audio_policy/server/etc/audio_policy_config.xml
index 33272a66..260af97e 100644
--- a/services/src/audio_policy/server/etc/audio_policy_config.xml
+++ b/services/src/audio_policy/server/etc/audio_policy_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (C) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2021-2022 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.
diff --git a/services/src/audio_policy/server/etc/baltimore/audio_policy_config.xml b/services/src/audio_policy/server/etc/m40/audio_policy_config.xml
similarity index 97%
rename from services/src/audio_policy/server/etc/baltimore/audio_policy_config.xml
rename to services/src/audio_policy/server/etc/m40/audio_policy_config.xml
index 6881d87f..1d5c032b 100644
--- a/services/src/audio_policy/server/etc/baltimore/audio_policy_config.xml
+++ b/services/src/audio_policy/server/etc/m40/audio_policy_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (C) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2021-2022 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.
diff --git a/services/src/audio_policy/server/etc/rk3568/audio_policy_config.xml b/services/src/audio_policy/server/etc/rk3568/audio_policy_config.xml
index 80a8ff0b..46f9076b 100644
--- a/services/src/audio_policy/server/etc/rk3568/audio_policy_config.xml
+++ b/services/src/audio_policy/server/etc/rk3568/audio_policy_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (C) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2021-2022 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.
diff --git a/services/src/audio_policy/server/service/include/audio_policy_service.h b/services/src/audio_policy/server/service/include/audio_policy_service.h
index 3225723f..ac69a32f 100644
--- a/services/src/audio_policy/server/service/include/audio_policy_service.h
+++ b/services/src/audio_policy/server/service/include/audio_policy_service.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -23,6 +23,7 @@
 #include "iport_observer.h"
 #include "parser_factory.h"
 
+#include <bitset>
 #include <list>
 #include <string>
 #include <unordered_map>
@@ -80,7 +81,7 @@ public:
 
     void OnDeviceStatusUpdated(DeviceType deviceType, bool connected, void *privData);
 
-    void OnServiceConnected();
+    void OnServiceConnected(AudioServiceIndex serviceIndex);
 
     int32_t SetAudioSessionCallback(AudioSessionCallback *callback);
 
@@ -94,7 +95,7 @@ private:
         mDeviceStatusListener = std::make_unique<DeviceStatusListener>(*this);
     }
 
-    virtual ~AudioPolicyService() {}
+    ~AudioPolicyService();
 
     std::string GetPortName(InternalDeviceType deviceType);
 
@@ -117,6 +118,7 @@ private:
     void TriggerDeviceChangedCallback(const std::vector<sptr<AudioDeviceDescriptor>> &devChangeDesc, bool connection);
 
     bool interruptEnabled_ = true;
+    std::bitset<MIN_SERVICE_COUNT> serviceFlag_;
     DeviceType mCurrentActiveDevice = DEVICE_TYPE_NONE;
     IAudioPolicyInterface& mAudioPolicyManager;
     Parser& mConfigParser;
diff --git a/services/src/audio_policy/server/service/include/audio_policy_service_proxy.h b/services/src/audio_policy/server/service/include/audio_policy_service_proxy.h
index 0dbbc462..620d6fa2 100644
--- a/services/src/audio_policy/server/service/include/audio_policy_service_proxy.h
+++ b/services/src/audio_policy/server/service/include/audio_policy_service_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -32,8 +32,8 @@ public:
     bool IsMicrophoneMute() override;
     int32_t SetAudioScene(AudioScene audioScene) override;
     std::vector<sptr<AudioDeviceDescriptor>> GetDevices(DeviceFlag deviceFlag) override;
-    const std::string GetAudioParameter(const std::string key) override;
-    void SetAudioParameter(const std::string key, const std::string value) override;
+    const std::string GetAudioParameter(const std::string &key) override;
+    void SetAudioParameter(const std::string &key, const std::string &value) override;
     int32_t UpdateActiveDeviceRoute(DeviceType type, DeviceFlag flag) override;
     const char *RetrieveCookie(int32_t &size) override;
 private:
diff --git a/services/src/audio_policy/server/service/include/common/audio_module_info.h b/services/src/audio_policy/server/service/include/common/audio_module_info.h
index 77ed8863..8267810c 100644
--- a/services/src/audio_policy/server/service/include/common/audio_module_info.h
+++ b/services/src/audio_policy/server/service/include/common/audio_module_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/include/common/audio_session_callback.h b/services/src/audio_policy/server/service/include/common/audio_session_callback.h
index 727c664c..4a34eb16 100644
--- a/services/src/audio_policy/server/service/include/common/audio_session_callback.h
+++ b/services/src/audio_policy/server/service/include/common/audio_session_callback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/include/config/audio_focus_parser.h b/services/src/audio_policy/server/service/include/config/audio_focus_parser.h
index 74d4b3dc..5b3f988d 100644
--- a/services/src/audio_policy/server/service/include/config/audio_focus_parser.h
+++ b/services/src/audio_policy/server/service/include/config/audio_focus_parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/include/config/parser.h b/services/src/audio_policy/server/service/include/config/parser.h
index 5d0140f3..49474bbd 100644
--- a/services/src/audio_policy/server/service/include/config/parser.h
+++ b/services/src/audio_policy/server/service/include/config/parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/include/config/parser_factory.h b/services/src/audio_policy/server/service/include/config/parser_factory.h
index e3b96855..70134c56 100644
--- a/services/src/audio_policy/server/service/include/config/parser_factory.h
+++ b/services/src/audio_policy/server/service/include/config/parser_factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/include/config/xml_parser.h b/services/src/audio_policy/server/service/include/config/xml_parser.h
index d4e7069a..9ceda312 100644
--- a/services/src/audio_policy/server/service/include/config/xml_parser.h
+++ b/services/src/audio_policy/server/service/include/config/xml_parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/include/interface/iaudio_policy_interface.h b/services/src/audio_policy/server/service/include/interface/iaudio_policy_interface.h
index 03d6ef3f..15af78ab 100644
--- a/services/src/audio_policy/server/service/include/interface/iaudio_policy_interface.h
+++ b/services/src/audio_policy/server/service/include/interface/iaudio_policy_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -43,7 +43,7 @@ public:
 
     virtual int32_t SetStreamMute(AudioStreamType streamType, bool mute) = 0;
 
-    virtual bool GetStreamMute(AudioStreamType streamType) = 0;
+    virtual bool GetStreamMute(AudioStreamType streamType) const = 0;
 
     virtual bool IsStreamActive(AudioStreamType streamType) = 0;
 
@@ -56,7 +56,7 @@ public:
 
     virtual int32_t SetRingerMode(AudioRingerMode ringerMode) = 0;
 
-    virtual AudioRingerMode GetRingerMode() = 0;
+    virtual AudioRingerMode GetRingerMode() const = 0;
 
     virtual int32_t SetAudioSessionCallback(AudioSessionCallback *callback) = 0;
 
diff --git a/services/src/audio_policy/server/service/include/interface/idevice_status_observer.h b/services/src/audio_policy/server/service/include/interface/idevice_status_observer.h
index 6392828b..cfc7133e 100644
--- a/services/src/audio_policy/server/service/include/interface/idevice_status_observer.h
+++ b/services/src/audio_policy/server/service/include/interface/idevice_status_observer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -23,7 +23,7 @@ namespace AudioStandard {
 class IDeviceStatusObserver {
 public:
     virtual void OnDeviceStatusUpdated(DeviceType deviceType, bool connected, void *privData) = 0;
-    virtual void OnServiceConnected() = 0;
+    virtual void OnServiceConnected(AudioServiceIndex serviceIndex) = 0;
 };
 } // namespace AudioStandard
 } // namespace OHOS
diff --git a/services/src/audio_policy/server/service/include/interface/iport_observer.h b/services/src/audio_policy/server/service/include/interface/iport_observer.h
index a7c63b9a..5dfca6ad 100644
--- a/services/src/audio_policy/server/service/include/interface/iport_observer.h
+++ b/services/src/audio_policy/server/service/include/interface/iport_observer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/include/listener/device_status_listener.h b/services/src/audio_policy/server/service/include/listener/device_status_listener.h
index 09ef5e61..82d5348b 100644
--- a/services/src/audio_policy/server/service/include/listener/device_status_listener.h
+++ b/services/src/audio_policy/server/service/include/listener/device_status_listener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/include/manager/audio_adapter_manager.h b/services/src/audio_policy/server/service/include/manager/audio_adapter_manager.h
index fedd14af..4704ad7d 100644
--- a/services/src/audio_policy/server/service/include/manager/audio_adapter_manager.h
+++ b/services/src/audio_policy/server/service/include/manager/audio_adapter_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -59,7 +59,7 @@ public:
 
     int32_t SetStreamMute(AudioStreamType streamType, bool mute);
 
-    bool GetStreamMute(AudioStreamType streamType);
+    bool GetStreamMute(AudioStreamType streamType) const;
 
     bool IsStreamActive(AudioStreamType streamType);
 
@@ -71,7 +71,7 @@ public:
 
     int32_t SetRingerMode(AudioRingerMode ringerMode);
 
-    AudioRingerMode GetRingerMode(void);
+    AudioRingerMode GetRingerMode(void) const;
 
     int32_t SetAudioSessionCallback(AudioSessionCallback *callback);
 
@@ -100,7 +100,7 @@ private:
     }
 
     bool ConnectToPulseAudio(void);
-    std::string GetModuleArgs(const AudioModuleInfo &audioModuleInfo);
+    std::string GetModuleArgs(const AudioModuleInfo &audioModuleInfo) const;
     std::string GetStreamNameByStreamType(AudioStreamType streamType);
     AudioStreamType GetStreamIDByType(std::string streamType);
     AudioStreamType GetStreamForVolumeMap(AudioStreamType streamType);
diff --git a/services/src/audio_policy/server/service/include/manager/audio_policy_manager_factory.h b/services/src/audio_policy/server/service/include/manager/audio_policy_manager_factory.h
index 7c993999..0f75ca43 100644
--- a/services/src/audio_policy/server/service/include/manager/audio_policy_manager_factory.h
+++ b/services/src/audio_policy/server/service/include/manager/audio_policy_manager_factory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_policy/server/service/src/audio_policy_service.cpp b/services/src/audio_policy/server/service/src/audio_policy_service.cpp
index dcf25b07..c9b0d5be 100644
--- a/services/src/audio_policy/server/service/src/audio_policy_service.cpp
+++ b/services/src/audio_policy/server/service/src/audio_policy_service.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -27,8 +27,15 @@ namespace AudioStandard {
 using namespace std;
 static sptr<IStandardAudioService> g_sProxy = nullptr;
 
+AudioPolicyService::~AudioPolicyService()
+{
+    MEDIA_ERR_LOG("~AudioPolicyService()");
+    Deinit();
+}
+
 bool AudioPolicyService::Init(void)
 {
+    serviceFlag_.reset();
     mAudioPolicyManager.Init();
     if (!mConfigParser.LoadConfiguration()) {
         MEDIA_ERR_LOG("Audio Config Load Configuration failed");
@@ -39,8 +46,8 @@ bool AudioPolicyService::Init(void)
         return false;
     }
 
-    std::unique_ptr<AudioFocusParser> audioFocusParser;
-    audioFocusParser = make_unique<AudioFocusParser>();
+    std::unique_ptr<AudioFocusParser> audioFocusParser = make_unique<AudioFocusParser>();
+    CHECK_AND_RETURN_RET_LOG(audioFocusParser != nullptr, false, "Failed to create AudioFocusParser");
     std::string AUDIO_FOCUS_CONFIG_FILE = "/etc/audio/audio_interrupt_policy_config.xml";
 
     if (audioFocusParser->LoadConfig(focusTable_[0][0])) {
@@ -86,14 +93,21 @@ bool AudioPolicyService::ConnectServiceAdapter()
         return false;
     }
 
+    if (serviceFlag_.count() != MIN_SERVICE_COUNT) {
+        OnServiceConnected(AudioServiceIndex::AUDIO_SERVICE_INDEX);
+    }
+
     return true;
 }
 
 void AudioPolicyService::Deinit(void)
 {
-    mAudioPolicyManager.CloseAudioPort(mIOHandles[PRIMARY_SPEAKER]);
-    mAudioPolicyManager.CloseAudioPort(mIOHandles[PRIMARY_MIC]);
+    MEDIA_ERR_LOG("Policy service died. closing active ports");
+    std::for_each(mIOHandles.begin(), mIOHandles.end(), [&](std::pair<std::string, AudioIOHandle> handle) {
+        mAudioPolicyManager.CloseAudioPort(handle.second);
+    });
 
+    mIOHandles.clear();
     mDeviceStatusListener->UnRegisterDeviceStatusListener();
     return;
 }
@@ -164,16 +178,15 @@ std::vector<sptr<AudioDeviceDescriptor>> AudioPolicyService::GetDevices(DeviceFl
     }
 
     if (deviceFlag == DeviceFlag::ALL_DEVICES_FLAG) {
-        deviceList = mConnectedDevices;
-        return deviceList;
+        return mConnectedDevices;
     }
 
     DeviceRole role = DeviceRole::OUTPUT_DEVICE;
     role = (deviceFlag == DeviceFlag::OUTPUT_DEVICES_FLAG) ? DeviceRole::OUTPUT_DEVICE : DeviceRole::INPUT_DEVICE;
 
     MEDIA_INFO_LOG("GetDevices mConnectedDevices size = [%{public}zu]", mConnectedDevices.size());
-    for (auto &device : mConnectedDevices) {
-        if (device->deviceRole_ == role) {
+    for (const auto &device : mConnectedDevices) {
+        if (device != nullptr && device->deviceRole_ == role) {
             auto devDesc = new(std::nothrow) AudioDeviceDescriptor(device->deviceType_, device->deviceRole_);
             deviceList.push_back(devDesc);
         }
@@ -190,6 +203,7 @@ DeviceType AudioPolicyService::FetchHighPriorityDevice()
 
     for (const auto &device : priorityList) {
         auto isPresent = [&device] (const sptr<AudioDeviceDescriptor> &desc) {
+            CHECK_AND_RETURN_RET_LOG(desc != nullptr, false, "FetchHighPriorityDevice device is nullptr");
             return desc->deviceType_ == device;
         };
 
@@ -446,23 +460,36 @@ void AudioPolicyService::OnDeviceStatusUpdated(DeviceType devType, bool isConnec
     MEDIA_INFO_LOG("output device list = [%{public}zu]", mConnectedDevices.size());
 }
 
-void AudioPolicyService::OnServiceConnected()
+void AudioPolicyService::OnServiceConnected(AudioServiceIndex serviceIndex)
 {
-    MEDIA_INFO_LOG("HDI service started: load modules");
-    int32_t result = ERROR;
+    MEDIA_INFO_LOG("[module_load]::OnServiceConnected for [%{public}d]", serviceIndex);
+    CHECK_AND_RETURN_LOG(serviceIndex >= HDI_SERVICE_INDEX && serviceIndex <= AUDIO_SERVICE_INDEX, "invalid index");
 
+    // If audio service or hdi service is not ready, donot load default modules
+    serviceFlag_.set(serviceIndex, true);
+    if (serviceFlag_.count() != MIN_SERVICE_COUNT) {
+        MEDIA_INFO_LOG("[module_load]::hdi service or audio service not up. Cannot load default module now");
+        return;
+    }
+
+    int32_t result = ERROR;
+    MEDIA_INFO_LOG("[module_load]::HDI and AUDIO SERVICE is READY. Loading default modules");
     auto primaryModulesPos = deviceClassInfo_.find(ClassType::TYPE_PRIMARY);
     if (primaryModulesPos != deviceClassInfo_.end()) {
         auto moduleInfoList = primaryModulesPos->second;
         for (auto &moduleInfo : moduleInfoList) {
-            MEDIA_INFO_LOG("Load modules: %{public}s", moduleInfo.name.c_str());
+            MEDIA_INFO_LOG("[module_load]::Load module[%{public}s]", moduleInfo.name.c_str());
             AudioIOHandle ioHandle = mAudioPolicyManager.OpenAudioPort(moduleInfo);
+            if (ioHandle == ERR_OPERATION_FAILED || ioHandle == ERR_INVALID_HANDLE) {
+                MEDIA_INFO_LOG("[module_load]::Open port failed");
+                continue;
+            }
 
             auto devType = GetDeviceType(moduleInfo.name);
             if (devType == DeviceType::DEVICE_TYPE_SPEAKER || devType == DeviceType::DEVICE_TYPE_MIC) {
                 result = mAudioPolicyManager.SetDeviceActive(ioHandle, devType, moduleInfo.name, true);
                 if (result != SUCCESS) {
-                    MEDIA_ERR_LOG("Activating device failed %{public}d", devType);
+                    MEDIA_ERR_LOG("[module_load]::Device failed %{public}d", devType);
                     break;
                 }
                 // add new device into active device list
@@ -476,7 +503,7 @@ void AudioPolicyService::OnServiceConnected()
     }
 
     if (result == SUCCESS) {
-        MEDIA_INFO_LOG("Setting speaker as active device on bootup");
+        MEDIA_INFO_LOG("[module_load]::Setting speaker as active device on bootup");
         mCurrentActiveDevice = DEVICE_TYPE_SPEAKER;
     }
 }
diff --git a/services/src/audio_policy/server/service/src/audio_policy_service_proxy.cpp b/services/src/audio_policy/server/service/src/audio_policy_service_proxy.cpp
index c5d918e0..afdb127e 100644
--- a/services/src/audio_policy/server/service/src/audio_policy_service_proxy.cpp
+++ b/services/src/audio_policy/server/service/src/audio_policy_service_proxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -127,12 +127,12 @@ std::vector<sptr<AudioDeviceDescriptor>> AudioPolicyServiceProxy::GetDevices(Dev
     return deviceInfo;
 }
 
-const std::string AudioPolicyServiceProxy::GetAudioParameter(const std::string key)
+const std::string AudioPolicyServiceProxy::GetAudioParameter(const std::string &key)
 {
     return "";
 }
 
-void AudioPolicyServiceProxy::SetAudioParameter(const std::string key, const std::string value)
+void AudioPolicyServiceProxy::SetAudioParameter(const std::string &key, const std::string &value)
 {
     return;
 }
diff --git a/services/src/audio_policy/server/service/src/config/audio_focus_parser.cpp b/services/src/audio_policy/server/service/src/config/audio_focus_parser.cpp
index 46a808cb..4c09aa69 100644
--- a/services/src/audio_policy/server/service/src/config/audio_focus_parser.cpp
+++ b/services/src/audio_policy/server/service/src/config/audio_focus_parser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -62,12 +62,12 @@ void AudioFocusParser::LoadDefaultConfig(AudioFocusEntry &focusTable)
 
 int32_t AudioFocusParser::LoadConfig(AudioFocusEntry &focusTable)
 {
-    xmlDoc *doc = NULL;
-    xmlNode *rootElement = NULL;
+    xmlDoc *doc = nullptr;
+    xmlNode *rootElement = nullptr;
 
     pIntrAction = &focusTable;
 
-    if ((doc = xmlReadFile(AUDIO_FOCUS_CONFIG_FILE, NULL, 0)) == NULL) {
+    if ((doc = xmlReadFile(AUDIO_FOCUS_CONFIG_FILE, nullptr, 0)) == nullptr) {
         MEDIA_ERR_LOG("error: could not parse file %s", AUDIO_FOCUS_CONFIG_FILE);
         LoadDefaultConfig(focusTable);
         return ERROR;
@@ -75,6 +75,7 @@ int32_t AudioFocusParser::LoadConfig(AudioFocusEntry &focusTable)
 
     rootElement = xmlDocGetRootElement(doc);
     xmlNode *currNode = rootElement;
+    CHECK_AND_RETURN_RET_LOG(currNode != nullptr, ERROR, "root element is null");
     if (!xmlStrcmp(currNode->name, reinterpret_cast<const xmlChar*>("audio_focus_policy"))) {
         if ((currNode->children) && (currNode->children->next)) {
             currNode = currNode->children->next;
@@ -96,7 +97,7 @@ int32_t AudioFocusParser::LoadConfig(AudioFocusEntry &focusTable)
 void AudioFocusParser::ParseFocusTable(xmlNode *node, char *curStream)
 {
     xmlNode *currNode = node;
-    while (currNode) {
+    while (currNode != nullptr) {
         if (currNode->type == XML_ELEMENT_NODE) {
             if (!xmlStrcmp(currNode->name, reinterpret_cast<const xmlChar*>("focus_table"))) {
                 MEDIA_INFO_LOG("node type: Element, name: %s", currNode->name);
@@ -149,14 +150,16 @@ void AudioFocusParser::ParseRejectedStreams(xmlNode *node, char *curStream)
                 if (it1 != streamMap.end()) {
                     AudioFocusEntry *pAction = pIntrAction + (streamMap[curStream] * MAX_NUM_STREAMS) +
                         streamMap[newStream];
-                    pAction->actionOn = INCOMING;
-                    pAction->hintType = INTERRUPT_HINT_NONE;
-                    pAction->forceType = INTERRUPT_FORCE;
-                    pAction->isReject = true;
+                    if (pAction != nullptr) {
+                        pAction->actionOn = INCOMING;
+                        pAction->hintType = INTERRUPT_HINT_NONE;
+                        pAction->forceType = INTERRUPT_FORCE;
+                        pAction->isReject = true;
 
-                    MEDIA_INFO_LOG("current stream: %s, incoming stream: %s", curStream, newStream);
-                    MEDIA_INFO_LOG("actionOn: %d, hintType: %d, forceType: %d isReject: %d", pAction->actionOn,
-                                   pAction->hintType, pAction->forceType, pAction->isReject);
+                        MEDIA_INFO_LOG("current stream: %s, incoming stream: %s", curStream, newStream);
+                        MEDIA_INFO_LOG("actionOn: %d, hintType: %d, forceType: %d isReject: %d", pAction->actionOn,
+                            pAction->hintType, pAction->forceType, pAction->isReject);
+                    }
                 }
                 xmlFree(newStream);
             }
diff --git a/services/src/audio_policy/server/service/src/config/xml_parser.cpp b/services/src/audio_policy/server/service/src/config/xml_parser.cpp
index 3a41bc77..d10808ef 100644
--- a/services/src/audio_policy/server/service/src/config/xml_parser.cpp
+++ b/services/src/audio_policy/server/service/src/config/xml_parser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#include <cstdlib>
 #include "media_log.h"
 
 #include "xml_parser.h"
@@ -22,8 +21,8 @@ namespace OHOS {
 namespace AudioStandard {
 bool XMLParser::LoadConfiguration()
 {
-    mDoc = xmlReadFile(CONFIG_FILE, NULL, 0);
-    if (mDoc == NULL) {
+    mDoc = xmlReadFile(CONFIG_FILE, nullptr, 0);
+    if (mDoc == nullptr) {
         MEDIA_ERR_LOG("xmlReadFile Failed");
         return false;
     }
@@ -34,7 +33,7 @@ bool XMLParser::LoadConfiguration()
 bool XMLParser::Parse()
 {
     xmlNode *root = xmlDocGetRootElement(mDoc);
-    if (root == NULL) {
+    if (root == nullptr) {
         MEDIA_ERR_LOG("xmlDocGetRootElement Failed");
         return false;
     }
@@ -48,11 +47,9 @@ bool XMLParser::Parse()
 
 void XMLParser::Destroy()
 {
-    if (mDoc != NULL) {
+    if (mDoc != nullptr) {
         xmlFreeDoc(mDoc);
     }
-
-    return;
 }
 
 bool XMLParser::ParseInternal(xmlNode &node)
@@ -80,7 +77,7 @@ bool XMLParser::ParseInternal(xmlNode &node)
 
 void XMLParser::ParseDeviceClass(xmlNode &node)
 {
-    xmlNode *modulesNode = NULL;
+    xmlNode *modulesNode = nullptr;
     modulesNode = node.xmlChildrenNode;
 
     std::string className = ExtractPropertyValue("name", node);
@@ -92,7 +89,7 @@ void XMLParser::ParseDeviceClass(xmlNode &node)
     deviceClassType_ = GetDeviceClassType(className);
     xmlParsedDataMap_[deviceClassType_] = {};
 
-    while (modulesNode != NULL) {
+    while (modulesNode != nullptr) {
         if (modulesNode->type == XML_ELEMENT_NODE) {
             ParseModules(*modulesNode, className);
         }
@@ -102,11 +99,11 @@ void XMLParser::ParseDeviceClass(xmlNode &node)
 
 void XMLParser::ParseModules(xmlNode &node, std::string &className)
 {
-    xmlNode *moduleNode = NULL;
+    xmlNode *moduleNode = nullptr;
     std::list<AudioModuleInfo> moduleList = {};
     moduleNode = node.xmlChildrenNode;
 
-    while (moduleNode != NULL) {
+    while (moduleNode != nullptr) {
         if (moduleNode->type == XML_ELEMENT_NODE) {
             AudioModuleInfo moduleInfo = {};
             moduleInfo.className = className;
@@ -131,10 +128,10 @@ void XMLParser::ParseModules(xmlNode &node, std::string &className)
 
 void XMLParser::ParsePorts(xmlNode &node, AudioModuleInfo &moduleInfo)
 {
-    xmlNode *portsNode = NULL;
+    xmlNode *portsNode = nullptr;
     portsNode = node.xmlChildrenNode;
 
-    while (portsNode != NULL) {
+    while (portsNode != nullptr) {
         if (portsNode->type == XML_ELEMENT_NODE) {
             ParsePort(*portsNode, moduleInfo);
         }
@@ -144,11 +141,11 @@ void XMLParser::ParsePorts(xmlNode &node, AudioModuleInfo &moduleInfo)
 
 void XMLParser::ParsePort(xmlNode &node, AudioModuleInfo &moduleInfo)
 {
-    xmlNode *portNode = NULL;
+    xmlNode *portNode = nullptr;
     std::list<AudioModuleInfo> portInfoList = {};
     portNode = node.xmlChildrenNode;
 
-    while (portNode != NULL) {
+    while (portNode != nullptr) {
         if (portNode->type == XML_ELEMENT_NODE) {
             moduleInfo.adapterName = ExtractPropertyValue("adapter_name", *portNode);
             moduleInfo.id = ExtractPropertyValue("id", *portNode);
diff --git a/services/src/audio_policy/server/service/src/listener/device_status_listener.cpp b/services/src/audio_policy/server/service/src/listener/device_status_listener.cpp
index 34d9e2cb..bb524c4b 100644
--- a/services/src/audio_policy/server/service/src/listener/device_status_listener.cpp
+++ b/services/src/audio_policy/server/service/src/listener/device_status_listener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -26,7 +26,7 @@
 namespace OHOS {
 namespace AudioStandard {
 namespace {
-#ifdef DEVICE_BALTIMORE
+#ifdef PRODUCT_M40
     const std::string AUDIO_HDI_SERVICE_NAME = "audio_adapter_service";
 #else
     const std::string AUDIO_HDI_SERVICE_NAME = "audio_hdi_service";
@@ -56,6 +56,7 @@ static DeviceType GetInternalDeviceType(AudioDeviceType hdiDeviceType)
 
 static void OnServiceStatusReceived(struct ServiceStatusListener *listener, struct ServiceStatus *serviceStatus)
 {
+    CHECK_AND_RETURN_LOG(serviceStatus != nullptr, "Invalid ServiceStatus");
     std::string info = serviceStatus->info;
     MEDIA_DEBUG_LOG("OnServiceStatusReceived: [service name:%{public}s] [status:%{public}d] [info:%{public}s]",
                     serviceStatus->serviceName, serviceStatus->status, info.c_str());
@@ -65,7 +66,7 @@ static void OnServiceStatusReceived(struct ServiceStatusListener *listener, stru
         CHECK_AND_RETURN_LOG(devListener != nullptr, "Invalid deviceStatusListener");
 
         if (serviceStatus->status == SERVIE_STATUS_START) {
-            devListener->deviceObserver_.OnServiceConnected();
+            devListener->deviceObserver_.OnServiceConnected(AudioServiceIndex::HDI_SERVICE_INDEX);
         } else if (serviceStatus->status == SERVIE_STATUS_CHANGE && !info.empty()) {
             AudioDeviceType hdiDeviceType = HDF_AUDIO_DEVICE_UNKOWN;
             AudioEventType hdiEventType = HDF_AUDIO_EVENT_UNKOWN;
diff --git a/services/src/audio_policy/server/service/src/manager/audio_adapter_manager.cpp b/services/src/audio_policy/server/service/src/manager/audio_adapter_manager.cpp
index 17927fd0..1d612878 100644
--- a/services/src/audio_policy/server/service/src/manager/audio_adapter_manager.cpp
+++ b/services/src/audio_policy/server/service/src/manager/audio_adapter_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -91,20 +91,17 @@ float AudioAdapterManager::GetStreamVolume(AudioStreamType streamType)
 
 int32_t AudioAdapterManager::SetStreamMute(AudioStreamType streamType, bool mute)
 {
-    bool result =  mAudioServiceAdapter->SetMute(streamType, mute);
-    return result;
+    return mAudioServiceAdapter->SetMute(streamType, mute);
 }
 
-bool AudioAdapterManager::GetStreamMute(AudioStreamType streamType)
+bool AudioAdapterManager::GetStreamMute(AudioStreamType streamType) const
 {
-    bool result =  mAudioServiceAdapter->IsMute(streamType);
-    return result;
+    return  mAudioServiceAdapter->IsMute(streamType);
 }
 
 bool AudioAdapterManager::IsStreamActive(AudioStreamType streamType)
 {
-    bool result = mAudioServiceAdapter->IsStreamActive(streamType);
-    return result;
+    return mAudioServiceAdapter->IsStreamActive(streamType);
 }
 
 int32_t AudioAdapterManager::SuspendAudioDevice(std::string &portName, bool isSuspend)
@@ -148,7 +145,7 @@ int32_t AudioAdapterManager::SetRingerMode(AudioRingerMode ringerMode)
     return SUCCESS;
 }
 
-AudioRingerMode AudioAdapterManager::GetRingerMode()
+AudioRingerMode AudioAdapterManager::GetRingerMode() const
 {
     return mRingerMode;
 }
@@ -163,17 +160,21 @@ AudioIOHandle AudioAdapterManager::OpenAudioPort(const AudioModuleInfo &audioMod
             if (ret) {
                 MEDIA_ERR_LOG("[AudioAdapterManager] Error Removing file: %{public}s Failed! ret val: %{public}d",
                     audioModuleInfo.fileName.c_str(), ret);
+                return ERR_OPERATION_FAILED;
             }
         } else {
             MEDIA_ERR_LOG("[AudioAdapterManager] Error audioModuleInfo.fileName is null! or file not exists");
+            return ERR_OPERATION_FAILED;
         }
     }
 
+    CHECK_AND_RETURN_RET_LOG(mAudioServiceAdapter != nullptr, ERR_OPERATION_FAILED, "ServiceAdapter is null");
     return mAudioServiceAdapter->OpenAudioPort(audioModuleInfo.lib, moduleArgs.c_str());
 }
 
 int32_t AudioAdapterManager::CloseAudioPort(AudioIOHandle ioHandle)
 {
+    CHECK_AND_RETURN_RET_LOG(mAudioServiceAdapter != nullptr, ERR_OPERATION_FAILED, "ServiceAdapter is null");
     return mAudioServiceAdapter->CloseAudioPort(ioHandle);
 }
 
@@ -202,7 +203,7 @@ void UpdateCommonArgs(const AudioModuleInfo &audioModuleInfo, std::string &args)
 }
 
 // Private Members
-std::string AudioAdapterManager::GetModuleArgs(const AudioModuleInfo &audioModuleInfo)
+std::string AudioAdapterManager::GetModuleArgs(const AudioModuleInfo &audioModuleInfo) const
 {
     std::string args;
 
@@ -374,7 +375,6 @@ void AudioAdapterManager::InitVolumeMap(bool isFirstBoot)
     } else {
         LoadVolumeMap();
     }
-    return;
 }
 
 void AudioAdapterManager::InitRingerMode(bool isFirstBoot)
diff --git a/services/src/audio_service/client/audio_manager_proxy.cpp b/services/src/audio_service/client/audio_manager_proxy.cpp
index a1fc5863..1a1adcd5 100644
--- a/services/src/audio_service/client/audio_manager_proxy.cpp
+++ b/services/src/audio_service/client/audio_manager_proxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -138,7 +138,7 @@ std::vector<sptr<AudioDeviceDescriptor>> AudioManagerProxy::GetDevices(DeviceFla
     return deviceInfo;
 }
 
-const std::string AudioManagerProxy::GetAudioParameter(const std::string key)
+const std::string AudioManagerProxy::GetAudioParameter(const std::string &key)
 {
     MessageParcel data;
     MessageParcel reply;
@@ -160,7 +160,7 @@ const std::string AudioManagerProxy::GetAudioParameter(const std::string key)
     return value;
 }
 
-void AudioManagerProxy::SetAudioParameter(const std::string key, const std::string value)
+void AudioManagerProxy::SetAudioParameter(const std::string &key, const std::string &value)
 {
     MessageParcel data;
     MessageParcel reply;
diff --git a/services/src/audio_service/client/audio_ringtone_manager.cpp b/services/src/audio_service/client/audio_ringtone_manager.cpp
index 594aacdf..1155d28b 100644
--- a/services/src/audio_service/client/audio_ringtone_manager.cpp
+++ b/services/src/audio_service/client/audio_ringtone_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -240,7 +240,7 @@ int32_t RingtonePlayer::Start()
         return ERROR;
     }
 
-    // Player doesnt support play in stopped state. Hence reiniialise player for making start<-->stop to work
+    // Player doesn't support play in stopped state. Hence reinitialise player for making start<-->stop to work
     if (ringtoneState_ == STATE_STOPPED) {
         (void)PrepareRingtonePlayer(true);
     } else {
diff --git a/services/src/audio_service/client/audio_service_client.cpp b/services/src/audio_service/client/audio_service_client.cpp
index 4628ca87..8dcf2f78 100644
--- a/services/src/audio_service/client/audio_service_client.cpp
+++ b/services/src/audio_service/client/audio_service_client.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -144,6 +144,10 @@ static size_t AlignToAudioFrameSize(size_t l, const pa_sample_spec &ss)
 
 void AudioServiceClient::PAStreamStartSuccessCb(pa_stream *stream, int32_t success, void *userdata)
 {
+    if (userdata == nullptr) {
+        MEDIA_ERR_LOG(" Error: userData is null!");
+        return;
+    }
     AudioServiceClient *asClient = static_cast<AudioServiceClient *>(userdata);
     pa_threaded_mainloop *mainLoop = static_cast<pa_threaded_mainloop *>(asClient->mainLoop);
 
@@ -366,7 +370,7 @@ AudioServiceClient::AudioServiceClient()
 
     mVolumeFactor = 1.0f;
     mStreamType = STREAM_MUSIC;
-    mAudioSystemMgr = NULL;
+    mAudioSystemMgr = nullptr;
 
     streamIndex = 0;
     volumeChannels = STEREO;
@@ -386,16 +390,16 @@ AudioServiceClient::AudioServiceClient()
     mFramePeriodWritten = 0;
     mTotalBytesRead = 0;
     mFramePeriodRead = 0;
-    mRenderPositionCb = NULL;
-    mRenderPeriodPositionCb = NULL;
+    mRenderPositionCb = nullptr;
+    mRenderPeriodPositionCb = nullptr;
 
-    mAudioRendererCallbacks = NULL;
-    mAudioCapturerCallbacks = NULL;
-    internalReadBuffer = NULL;
-    mainLoop = NULL;
-    paStream = NULL;
-    context  = NULL;
-    api = NULL;
+    mAudioRendererCallbacks = nullptr;
+    mAudioCapturerCallbacks = nullptr;
+    internalReadBuffer = nullptr;
+    mainLoop = nullptr;
+    paStream = nullptr;
+    context  = nullptr;
+    api = nullptr;
 
     internalRdBufIndex = 0;
     internalRdBufLen = 0;
@@ -408,7 +412,7 @@ AudioServiceClient::AudioServiceClient()
     acache.writeIndex = 0;
     acache.isFull = false;
     acache.totalCacheSize = 0;
-    acache.buffer = NULL;
+    acache.buffer = nullptr;
 
     PAStreamCorkSuccessCb = PAStreamStopSuccessCb;
 }
@@ -420,11 +424,11 @@ void AudioServiceClient::ResetPAAudioClient()
         pa_threaded_mainloop_stop(mainLoop);
 
     if (paStream) {
-        pa_stream_set_state_callback(paStream, NULL, NULL);
-        pa_stream_set_write_callback(paStream, NULL, NULL);
-        pa_stream_set_read_callback(paStream, NULL, NULL);
-        pa_stream_set_latency_update_callback(paStream, NULL, NULL);
-        pa_stream_set_underflow_callback(paStream, NULL, NULL);
+        pa_stream_set_state_callback(paStream, nullptr, nullptr);
+        pa_stream_set_write_callback(paStream, nullptr, nullptr);
+        pa_stream_set_read_callback(paStream, nullptr, nullptr);
+        pa_stream_set_latency_update_callback(paStream, nullptr, nullptr);
+        pa_stream_set_underflow_callback(paStream, nullptr, nullptr);
 
         if (isStreamConnected == true)
             pa_stream_disconnect(paStream);
@@ -432,7 +436,7 @@ void AudioServiceClient::ResetPAAudioClient()
     }
 
     if (context) {
-        pa_context_set_state_callback(context, NULL, NULL);
+        pa_context_set_state_callback(context, nullptr, nullptr);
         if (isContextConnected == true)
             pa_context_disconnect(context);
         pa_context_unref(context);
@@ -468,26 +472,26 @@ void AudioServiceClient::ResetPAAudioClient()
     sourceOutputs.clear();
     clientInfo.clear();
 
-    mAudioRendererCallbacks = NULL;
-    mAudioCapturerCallbacks = NULL;
-    internalReadBuffer      = NULL;
+    mAudioRendererCallbacks = nullptr;
+    mAudioCapturerCallbacks = nullptr;
+    internalReadBuffer      = nullptr;
 
-    mainLoop = NULL;
-    paStream = NULL;
-    context  = NULL;
-    api      = NULL;
+    mainLoop = nullptr;
+    paStream = nullptr;
+    context  = nullptr;
+    api      = nullptr;
 
     internalRdBufIndex = 0;
     internalRdBufLen   = 0;
     underFlowCount     = 0;
 
-    acache.buffer = NULL;
+    acache.buffer = nullptr;
     acache.readIndex = 0;
     acache.writeIndex = 0;
     acache.isFull = false;
     acache.totalCacheSize = 0;
 
-    PAStreamCorkSuccessCb = NULL;
+    PAStreamCorkSuccessCb = nullptr;
 }
 
 AudioServiceClient::~AudioServiceClient()
@@ -506,13 +510,13 @@ static std::string GetClientBundle(int uid)
 
     sptr<IRemoteObject> object = samgr->GetSystemAbility(BUNDLE_MGR_SERVICE_SYS_ABILITY_ID);
     if (object == nullptr) {
-        MEDIA_DEBUG_LOG("object is NULL.");
+        MEDIA_DEBUG_LOG("object is nullptr.");
         return bundleName;
     }
 
     sptr<AppExecFwk::IBundleMgr> bms = iface_cast<AppExecFwk::IBundleMgr>(object);
     if (bms == nullptr) {
-        MEDIA_DEBUG_LOG("bundle manager service is NULL.");
+        MEDIA_DEBUG_LOG("bundle manager service is nullptr.");
         return bundleName;
     }
 
@@ -540,17 +544,17 @@ int32_t AudioServiceClient::Initialize(ASClientType eClientType)
     mAudioSystemMgr = AudioSystemManager::GetInstance();
 
     mainLoop = pa_threaded_mainloop_new();
-    if (mainLoop == NULL)
+    if (mainLoop == nullptr)
         return AUDIO_CLIENT_INIT_ERR;
 
     api = pa_threaded_mainloop_get_api(mainLoop);
-    if (api == NULL) {
+    if (api == nullptr) {
         ResetPAAudioClient();
         return AUDIO_CLIENT_INIT_ERR;
     }
 
     context = pa_context_new(api, "AudioServiceClient");
-    if (context == NULL) {
+    if (context == nullptr) {
         ResetPAAudioClient();
         return AUDIO_CLIENT_INIT_ERR;
     }
@@ -578,7 +582,7 @@ int32_t AudioServiceClient::Initialize(ASClientType eClientType)
         pa_context_load_cookie_from_file(context, appCookiePath.c_str());
     }
 
-    if (pa_context_connect(context, NULL, PA_CONTEXT_NOFAIL, NULL) < 0) {
+    if (pa_context_connect(context, nullptr, PA_CONTEXT_NOFAIL, nullptr) < 0) {
         error = pa_context_errno(context);
         MEDIA_ERR_LOG("context connect error: %{public}s", pa_strerror(error));
         ResetPAAudioClient();
@@ -684,14 +688,14 @@ int32_t AudioServiceClient::ConnectStreamToPA()
     bufferAttr.minreq = pa_usec_to_bytes(LATENCY_IN_MSEC * PA_USEC_PER_MSEC, &sampleSpec);
 
     if (eAudioClientType == AUDIO_SERVICE_CLIENT_PLAYBACK)
-        result = pa_stream_connect_playback(paStream, NULL, &bufferAttr,
+        result = pa_stream_connect_playback(paStream, nullptr, &bufferAttr,
                                             (pa_stream_flags_t)(PA_STREAM_ADJUST_LATENCY
                                             | PA_STREAM_INTERPOLATE_TIMING
                                             | PA_STREAM_START_CORKED
                                             | PA_STREAM_AUTO_TIMING_UPDATE
-                                            | PA_STREAM_VARIABLE_RATE), NULL, NULL);
+                                            | PA_STREAM_VARIABLE_RATE), nullptr, nullptr);
     else
-        result = pa_stream_connect_record(paStream, NULL, NULL,
+        result = pa_stream_connect_record(paStream, nullptr, nullptr,
                                           (pa_stream_flags_t)(PA_STREAM_INTERPOLATE_TIMING
                                           | PA_STREAM_ADJUST_LATENCY
                                           | PA_STREAM_START_CORKED
@@ -735,13 +739,13 @@ int32_t AudioServiceClient::InitializeAudioCache()
     }
 
     const pa_buffer_attr *bufferAttr = pa_stream_get_buffer_attr(paStream);
-    if (bufferAttr == NULL) {
+    if (bufferAttr == nullptr) {
         MEDIA_ERR_LOG("pa stream get buffer attribute returned null");
         return AUDIO_CLIENT_INIT_ERR;
     }
 
     acache.buffer = make_unique<uint8_t[]>(bufferAttr->minreq);
-    if (acache.buffer == NULL) {
+    if (acache.buffer == nullptr) {
         MEDIA_ERR_LOG("Allocate memory for buffer failed");
         return AUDIO_CLIENT_INIT_ERR;
     }
@@ -769,13 +773,13 @@ int32_t AudioServiceClient::CreateStream(AudioStreamParams audioParams, AudioStr
     const std::string streamName = GetStreamName(audioType);
 
     auto timenow = chrono::system_clock::to_time_t(chrono::system_clock::now());
-    const std::string StreamStartTime = ctime(&timenow);
+    const std::string streamStartTime = ctime(&timenow);
 
     sampleSpec = ConvertToPAAudioParams(audioParams);
     mFrameSize = pa_frame_size(&sampleSpec);
 
     pa_proplist *propList = pa_proplist_new();
-    if (propList == NULL) {
+    if (propList == nullptr) {
         MEDIA_ERR_LOG("pa_proplist_new failed");
         ResetPAAudioClient();
         return AUDIO_CLIENT_CREATE_STREAM_ERR;
@@ -784,9 +788,9 @@ int32_t AudioServiceClient::CreateStream(AudioStreamParams audioParams, AudioStr
     pa_proplist_sets(propList, "stream.type", streamName.c_str());
     pa_proplist_sets(propList, "stream.volumeFactor", std::to_string(mVolumeFactor).c_str());
     pa_proplist_sets(propList, "stream.sessionID", std::to_string(pa_context_get_index(context)).c_str());
-    pa_proplist_sets(propList, "stream.startTime", StreamStartTime.c_str());
+    pa_proplist_sets(propList, "stream.startTime", streamStartTime.c_str());
 
-    if (!(paStream = pa_stream_new_with_proplist(context, streamName.c_str(), &sampleSpec, NULL, propList))) {
+    if (!(paStream = pa_stream_new_with_proplist(context, streamName.c_str(), &sampleSpec, nullptr, propList))) {
         error = pa_context_errno(context);
         pa_proplist_free(propList);
         pa_threaded_mainloop_unlock(mainLoop);
@@ -833,7 +837,7 @@ int32_t AudioServiceClient::CreateStream(AudioStreamParams audioParams, AudioStr
     return AUDIO_CLIENT_SUCCESS;
 }
 
-int32_t AudioServiceClient::GetSessionID(uint32_t &sessionID)
+int32_t AudioServiceClient::GetSessionID(uint32_t &sessionID) const
 {
     MEDIA_DEBUG_LOG("AudioServiceClient: GetSessionID");
     uint32_t client_index = pa_context_get_index(context);
@@ -849,11 +853,12 @@ int32_t AudioServiceClient::GetSessionID(uint32_t &sessionID)
 int32_t AudioServiceClient::StartStream()
 {
     int error;
+
     if (CheckPaStatusIfinvalid(mainLoop, context, paStream, AUDIO_CLIENT_PA_ERR) < 0) {
         return AUDIO_CLIENT_PA_ERR;
     }
-    
-    pa_operation *operation = NULL;
+
+    pa_operation *operation = nullptr;
 
     pa_threaded_mainloop_lock(mainLoop);
 
@@ -927,7 +932,7 @@ int32_t AudioServiceClient::CorkStream()
         return AUDIO_CLIENT_PA_ERR;
     }
 
-    pa_operation *operation = NULL;
+    pa_operation *operation = nullptr;
 
     pa_threaded_mainloop_lock(mainLoop);
     pa_stream_state_t state = pa_stream_get_state(paStream);
@@ -953,11 +958,12 @@ int32_t AudioServiceClient::CorkStream()
 int32_t AudioServiceClient::FlushStream()
 {
     int error;
+
     if (CheckPaStatusIfinvalid(mainLoop, context, paStream, AUDIO_CLIENT_PA_ERR) < 0) {
         return AUDIO_CLIENT_PA_ERR;
     }
     
-    pa_operation *operation = NULL;
+    pa_operation *operation = nullptr;
 
     lock_guard<mutex> lock(dataMutex);
     pa_threaded_mainloop_lock(mainLoop);
@@ -972,7 +978,7 @@ int32_t AudioServiceClient::FlushStream()
 
     streamFlushStatus = 0;
     operation = pa_stream_flush(paStream, PAStreamFlushSuccessCb, (void *)this);
-    if (operation == NULL) {
+    if (operation == nullptr) {
         MEDIA_ERR_LOG("Stream Flush Operation Failed");
         pa_threaded_mainloop_unlock(mainLoop);
         return AUDIO_CLIENT_ERR;
@@ -1016,7 +1022,10 @@ int32_t AudioServiceClient::DrainStream()
         return AUDIO_CLIENT_PA_ERR;
     }
 
-    pa_operation *operation = NULL;
+    if (CheckPaStatusIfinvalid(mainLoop, context, paStream, AUDIO_CLIENT_PA_ERR) < 0) {
+        return AUDIO_CLIENT_PA_ERR;
+    }
+    pa_operation *operation = nullptr;
 
     pa_threaded_mainloop_lock(mainLoop);
 
@@ -1075,7 +1084,7 @@ int32_t AudioServiceClient::PaWriteStream(const uint8_t *buffer, size_t &length)
             break;
         }
 
-        error = pa_stream_write(paStream, (void *)buffer, writableSize, NULL, 0LL,
+        error = pa_stream_write(paStream, (void *)buffer, writableSize, nullptr, 0LL,
                                 PA_SEEK_RELATIVE);
         if (error < 0) {
             MEDIA_ERR_LOG("Write stream failed");
@@ -1097,6 +1106,11 @@ int32_t AudioServiceClient::PaWriteStream(const uint8_t *buffer, size_t &length)
 void AudioServiceClient::HandleRenderPositionCallbacks(size_t bytesWritten)
 {
     mTotalBytesWritten += bytesWritten;
+    if (mFrameSize == 0) {
+        MEDIA_ERR_LOG("HandleRenderPositionCallbacks: capturePeriodPositionCb not set");
+        return;
+    }
+
     uint64_t writtenFrameNumber = mTotalBytesWritten / mFrameSize;
     MEDIA_DEBUG_LOG("frame size: %{public}d", mFrameSize);
     if (!mMarkReached && mRenderPositionCb) {
@@ -1133,7 +1147,7 @@ int32_t AudioServiceClient::DrainAudioCache()
     pa_threaded_mainloop_lock(mainLoop);
 
     int32_t error = 0;
-    if (acache.buffer == NULL) {
+    if (acache.buffer == nullptr) {
         MEDIA_ERR_LOG("Drain cache failed");
         return AUDIO_CLIENT_ERR;
     }
@@ -1152,7 +1166,7 @@ int32_t AudioServiceClient::DrainAudioCache()
 
 size_t AudioServiceClient::WriteToAudioCache(const StreamBuffer &stream)
 {
-    if (stream.buffer == NULL) {
+    if (stream.buffer == nullptr) {
         return 0;
     }
 
@@ -1222,7 +1236,7 @@ size_t AudioServiceClient::WriteStream(const StreamBuffer &stream, int32_t &pErr
     }
     pa_threaded_mainloop_lock(mainLoop);
 
-    if (acache.buffer == NULL) {
+    if (acache.buffer == nullptr) {
         MEDIA_ERR_LOG("Buffer is null");
         pError = AUDIO_CLIENT_WRITE_STREAM_ERR;
         return cachedLen;
@@ -1279,7 +1293,7 @@ int32_t AudioServiceClient::UpdateReadBuffer(uint8_t *buffer, size_t &length, si
 
     if (!internalRdBufLen) {
         int retVal = pa_stream_drop(paStream);
-        internalReadBuffer = NULL;
+        internalReadBuffer = nullptr;
         internalRdBufLen = 0;
         internalRdBufIndex = 0;
         if (retVal < 0) {
@@ -1302,6 +1316,11 @@ void AudioServiceClient::OnTimeOut()
 void AudioServiceClient::HandleCapturePositionCallbacks(size_t bytesRead)
 {
     mTotalBytesRead += bytesRead;
+    if (mFrameSize == 0) {
+        MEDIA_ERR_LOG("HandleCapturePositionCallbacks: capturePeriodPositionCb not set");
+        return;
+    }
+
     uint64_t readFrameNumber = mTotalBytesRead / mFrameSize;
     MEDIA_DEBUG_LOG("frame size: %{public}d", mFrameSize);
     if (!mMarkReached && mCapturePositionCb) {
@@ -1409,7 +1428,7 @@ int32_t AudioServiceClient::SetBufferSizeInMsec(int32_t bufferSizeInMsec)
     return AUDIO_CLIENT_SUCCESS;
 }
 
-int32_t AudioServiceClient::GetMinimumBufferSize(size_t &minBufferSize)
+int32_t AudioServiceClient::GetMinimumBufferSize(size_t &minBufferSize) const
 {
     if (CheckPaStatusIfinvalid(mainLoop, context, paStream, AUDIO_CLIENT_PA_ERR) < 0) {
         return AUDIO_CLIENT_PA_ERR;
@@ -1417,8 +1436,8 @@ int32_t AudioServiceClient::GetMinimumBufferSize(size_t &minBufferSize)
 
     const pa_buffer_attr *bufferAttr = pa_stream_get_buffer_attr(paStream);
 
-    if (bufferAttr == NULL) {
-        MEDIA_ERR_LOG("pa_stream_get_buffer_attr returned NULL");
+    if (bufferAttr == nullptr) {
+        MEDIA_ERR_LOG("pa_stream_get_buffer_attr returned nullptr");
         return AUDIO_CLIENT_ERR;
     }
 
@@ -1437,7 +1456,7 @@ int32_t AudioServiceClient::GetMinimumBufferSize(size_t &minBufferSize)
     return AUDIO_CLIENT_SUCCESS;
 }
 
-int32_t AudioServiceClient::GetMinimumFrameCount(uint32_t &frameCount)
+int32_t AudioServiceClient::GetMinimumFrameCount(uint32_t &frameCount) const
 {
     if (CheckPaStatusIfinvalid(mainLoop, context, paStream, AUDIO_CLIENT_PA_ERR) < 0) {
         return AUDIO_CLIENT_PA_ERR;
@@ -1447,8 +1466,8 @@ int32_t AudioServiceClient::GetMinimumFrameCount(uint32_t &frameCount)
 
     const pa_buffer_attr *bufferAttr = pa_stream_get_buffer_attr(paStream);
 
-    if (bufferAttr == NULL) {
-        MEDIA_ERR_LOG("pa_stream_get_buffer_attr returned NULL");
+    if (bufferAttr == nullptr) {
+        MEDIA_ERR_LOG("pa_stream_get_buffer_attr returned nullptr");
         return AUDIO_CLIENT_ERR;
     }
 
@@ -1475,22 +1494,22 @@ int32_t AudioServiceClient::GetMinimumFrameCount(uint32_t &frameCount)
     return AUDIO_CLIENT_SUCCESS;
 }
 
-uint32_t AudioServiceClient::GetSamplingRate()
+uint32_t AudioServiceClient::GetSamplingRate() const
 {
     return DEFAULT_SAMPLING_RATE;
 }
 
-uint8_t AudioServiceClient::GetChannelCount()
+uint8_t AudioServiceClient::GetChannelCount() const
 {
     return DEFAULT_CHANNEL_COUNT;
 }
 
-uint8_t AudioServiceClient::GetSampleSize()
+uint8_t AudioServiceClient::GetSampleSize() const
 {
     return DEFAULT_SAMPLE_SIZE;
 }
 
-int32_t AudioServiceClient::GetAudioStreamParams(AudioStreamParams& audioParams)
+int32_t AudioServiceClient::GetAudioStreamParams(AudioStreamParams& audioParams) const
 {
     if (CheckPaStatusIfinvalid(mainLoop, context, paStream, AUDIO_CLIENT_PA_ERR) < 0) {
         return AUDIO_CLIENT_PA_ERR;
@@ -1512,7 +1531,7 @@ uint32_t AudioServiceClient::GetStreamVolume(uint32_t sessionID)
     return DEFAULT_STREAM_VOLUME;
 }
 
-int32_t AudioServiceClient::GetCurrentTimeStamp(uint64_t &timeStamp)
+int32_t AudioServiceClient::GetCurrentTimeStamp(uint64_t &timeStamp) const
 {
     if (CheckPaStatusIfinvalid(mainLoop, context, paStream, AUDIO_CLIENT_PA_ERR) < 0) {
         return AUDIO_CLIENT_PA_ERR;
@@ -1522,7 +1541,7 @@ int32_t AudioServiceClient::GetCurrentTimeStamp(uint64_t &timeStamp)
 
     pa_threaded_mainloop_lock(mainLoop);
     const pa_timing_info *info = pa_stream_get_timing_info(paStream);
-    if (!info) {
+    if (info == nullptr) {
         retVal = AUDIO_CLIENT_ERR;
     } else {
         if (eAudioClientType == AUDIO_SERVICE_CLIENT_PLAYBACK) {
@@ -1538,7 +1557,7 @@ int32_t AudioServiceClient::GetCurrentTimeStamp(uint64_t &timeStamp)
     return retVal;
 }
 
-int32_t AudioServiceClient::GetAudioLatency(uint64_t &latency)
+int32_t AudioServiceClient::GetAudioLatency(uint64_t &latency) const
 {
     if (CheckPaStatusIfinvalid(mainLoop, context, paStream, AUDIO_CLIENT_PA_ERR) < 0) {
         return AUDIO_CLIENT_PA_ERR;
@@ -1621,7 +1640,12 @@ void AudioServiceClient::SetRendererPeriodPositionCallback(int64_t periodPositio
 {
     MEDIA_INFO_LOG("Registering render period position callback");
     mFramePeriodNumber = periodPosition;
-    mFramePeriodWritten = (mTotalBytesWritten / mFrameSize) % mFramePeriodNumber;
+    if ((mFrameSize != 0) && (mFramePeriodNumber != 0)) {
+        mFramePeriodWritten = (mTotalBytesWritten / mFrameSize) % mFramePeriodNumber;
+    } else {
+        MEDIA_ERR_LOG("AudioServiceClient::SetRendererPeriodPositionCallback failed");
+        return;
+    }
     mRenderPeriodPositionCb = callback;
 }
 
@@ -1655,7 +1679,12 @@ void AudioServiceClient::SetCapturerPeriodPositionCallback(int64_t periodPositio
 {
     MEDIA_INFO_LOG("Registering period position callback");
     mFramePeriodNumber = periodPosition;
-    mFramePeriodRead = (mTotalBytesRead / mFrameSize) % mFramePeriodNumber;
+    if ((mFrameSize != 0) && (mFramePeriodNumber) != 0) {
+        mFramePeriodRead = (mTotalBytesRead / mFrameSize) % mFramePeriodNumber;
+    } else {
+        MEDIA_INFO_LOG("AudioServiceClient::SetCapturerPeriodPositionCallback failed");
+        return;
+    }
     mCapturePeriodPositionCb = callback;
 }
 
@@ -1671,7 +1700,7 @@ int32_t AudioServiceClient::SetStreamType(AudioStreamType audioStreamType)
 {
     MEDIA_INFO_LOG("SetStreamType: %{public}d", audioStreamType);
 
-    if (context == NULL) {
+    if (context == nullptr) {
         MEDIA_ERR_LOG("context is null");
         return AUDIO_CLIENT_ERR;
     }
@@ -1682,7 +1711,7 @@ int32_t AudioServiceClient::SetStreamType(AudioStreamType audioStreamType)
     const std::string streamName = GetStreamName(audioStreamType);
 
     pa_proplist *propList = pa_proplist_new();
-    if (propList == NULL) {
+    if (propList == nullptr) {
         MEDIA_ERR_LOG("pa_proplist_new failed");
         pa_threaded_mainloop_unlock(mainLoop);
         return AUDIO_CLIENT_ERR;
@@ -1690,7 +1719,8 @@ int32_t AudioServiceClient::SetStreamType(AudioStreamType audioStreamType)
 
     pa_proplist_sets(propList, "stream.type", streamName.c_str());
     pa_proplist_sets(propList, "media.name", streamName.c_str());
-    pa_operation *updatePropOperation = pa_stream_proplist_update(paStream, PA_UPDATE_REPLACE, propList, NULL, NULL);
+    pa_operation *updatePropOperation = pa_stream_proplist_update(paStream, PA_UPDATE_REPLACE, propList,
+        nullptr, nullptr);
     pa_proplist_free(propList);
     pa_operation_unref(updatePropOperation);
 
@@ -1704,7 +1734,7 @@ int32_t AudioServiceClient::SetStreamVolume(float volume)
     lock_guard<mutex> lock(ctrlMutex);
     MEDIA_INFO_LOG("SetVolume volume: %{public}f", volume);
 
-    if (context == NULL) {
+    if (context == nullptr) {
         MEDIA_ERR_LOG("context is null");
         return AUDIO_CLIENT_ERR;
     }
@@ -1719,18 +1749,19 @@ int32_t AudioServiceClient::SetStreamVolume(float volume)
 
     mVolumeFactor = volume;
     pa_proplist *propList = pa_proplist_new();
-    if (propList == NULL) {
+    if (propList == nullptr) {
         MEDIA_ERR_LOG("pa_proplist_new failed");
         pa_threaded_mainloop_unlock(mainLoop);
         return AUDIO_CLIENT_ERR;
     }
 
     pa_proplist_sets(propList, "stream.volumeFactor", std::to_string(mVolumeFactor).c_str());
-    pa_operation *updatePropOperation = pa_stream_proplist_update(paStream, PA_UPDATE_REPLACE, propList, NULL, NULL);
+    pa_operation *updatePropOperation = pa_stream_proplist_update(paStream, PA_UPDATE_REPLACE, propList,
+        nullptr, nullptr);
     pa_proplist_free(propList);
     pa_operation_unref(updatePropOperation);
 
-    if (mAudioSystemMgr == NULL) {
+    if (mAudioSystemMgr == nullptr) {
         MEDIA_ERR_LOG("System manager instance is null");
         pa_threaded_mainloop_unlock(mainLoop);
         return AUDIO_CLIENT_ERR;
@@ -1740,7 +1771,7 @@ int32_t AudioServiceClient::SetStreamVolume(float volume)
         uint32_t idx = pa_stream_get_index(paStream);
         pa_operation *operation = pa_context_get_sink_input_info(context, idx, AudioServiceClient::GetSinkInputInfoCb,
             reinterpret_cast<void *>(this));
-        if (operation == NULL) {
+        if (operation == nullptr) {
             MEDIA_ERR_LOG("pa_context_get_sink_input_info_list returned null");
             pa_threaded_mainloop_unlock(mainLoop);
             return AUDIO_CLIENT_ERR;
@@ -1763,13 +1794,14 @@ float AudioServiceClient::GetStreamVolume()
     return mVolumeFactor;
 }
 
-void AudioServiceClient::GetSinkInputInfoCb(pa_context *c, const pa_sink_input_info *i, int eol, void *userdata)
+void AudioServiceClient::GetSinkInputInfoCb(pa_context *context, const pa_sink_input_info *info, int eol,
+    void *userdata)
 {
     MEDIA_INFO_LOG("GetSinkInputInfoVolumeCb in");
     AudioServiceClient *thiz = reinterpret_cast<AudioServiceClient *>(userdata);
 
     if (eol < 0) {
-        MEDIA_ERR_LOG("Failed to get sink input information: %{public}s", pa_strerror(pa_context_errno(c)));
+        MEDIA_ERR_LOG("Failed to get sink input information: %{public}s", pa_strerror(pa_context_errno(context)));
         return;
     }
 
@@ -1778,14 +1810,14 @@ void AudioServiceClient::GetSinkInputInfoCb(pa_context *c, const pa_sink_input_i
         return;
     }
 
-    if (i->proplist == NULL) {
-        MEDIA_ERR_LOG("Invalid prop list for sink input (%{public}d).", i->index);
+    if (info->proplist == nullptr) {
+        MEDIA_ERR_LOG("Invalid prop list for sink input (%{public}d).", info->index);
         return;
     }
 
-    thiz->cvolume = i->volume;
-    thiz->streamIndex = i->index;
-    thiz->volumeChannels = i->channel_map.channels;
+    thiz->cvolume = info->volume;
+    thiz->streamIndex = info->index;
+    thiz->volumeChannels = info->channel_map.channels;
     thiz->streamInfoUpdated = true;
 
     SetPaVolume(*thiz);
@@ -1808,7 +1840,7 @@ void AudioServiceClient::SetPaVolume(const AudioServiceClient &client)
 
     uint32_t volume = pa_sw_volume_from_linear(vol);
     pa_cvolume_set(&cv, client.volumeChannels, volume);
-    pa_operation_unref(pa_context_set_sink_input_volume(client.context, client.streamIndex, &cv, NULL, NULL));
+    pa_operation_unref(pa_context_set_sink_input_volume(client.context, client.streamIndex, &cv, nullptr, nullptr));
 
     MEDIA_INFO_LOG("Applied volume : %{public}f, pa volume: %{public}d", vol, volume);
 }
@@ -1836,7 +1868,7 @@ int32_t AudioServiceClient::SetStreamRenderRate(AudioRendererRate audioRendererR
     }
 
     pa_threaded_mainloop_lock(mainLoop);
-    pa_operation *operation = pa_stream_update_sample_rate(paStream, rate, NULL, NULL);
+    pa_operation *operation = pa_stream_update_sample_rate(paStream, rate, nullptr, nullptr);
     pa_operation_unref(operation);
     pa_threaded_mainloop_unlock(mainLoop);
 
diff --git a/services/src/audio_service/client/audio_session.cpp b/services/src/audio_service/client/audio_session.cpp
index abc4fa75..055b7d24 100644
--- a/services/src/audio_service/client/audio_session.cpp
+++ b/services/src/audio_service/client/audio_session.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_service/client/audio_stream.cpp b/services/src/audio_service/client/audio_stream.cpp
index 1423b9a5..18574049 100644
--- a/services/src/audio_service/client/audio_stream.cpp
+++ b/services/src/audio_service/client/audio_stream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -34,6 +34,51 @@ constexpr int32_t WRITE_RETRY_DELAY_IN_US = 500;
 constexpr int32_t READ_WRITE_WAIT_TIME_IN_US = 500;
 constexpr int32_t CB_WRITE_BUFFERS_WAIT_IN_US = 500;
 
+const map<pair<ContentType, StreamUsage>, AudioStreamType> AudioStream::streamTypeMap_ = AudioStream::CreateStreamMap();
+
+map<pair<ContentType, StreamUsage>, AudioStreamType> AudioStream::CreateStreamMap()
+{
+    map<pair<ContentType, StreamUsage>, AudioStreamType> streamMap;
+
+    streamMap[make_pair(CONTENT_TYPE_UNKNOWN, STREAM_USAGE_UNKNOWN)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_UNKNOWN, STREAM_USAGE_MEDIA)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_UNKNOWN, STREAM_USAGE_VOICE_COMMUNICATION)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_UNKNOWN, STREAM_USAGE_VOICE_ASSISTANT)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_UNKNOWN, STREAM_USAGE_NOTIFICATION_RINGTONE)] = STREAM_MUSIC;
+
+    streamMap[make_pair(CONTENT_TYPE_SPEECH, STREAM_USAGE_UNKNOWN)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_SPEECH, STREAM_USAGE_MEDIA)] = STREAM_VOICE_ASSISTANT;
+    streamMap[make_pair(CONTENT_TYPE_SPEECH, STREAM_USAGE_VOICE_COMMUNICATION)] = STREAM_VOICE_CALL;
+    streamMap[make_pair(CONTENT_TYPE_SPEECH, STREAM_USAGE_VOICE_ASSISTANT)] = STREAM_VOICE_ASSISTANT;
+    streamMap[make_pair(CONTENT_TYPE_SPEECH, STREAM_USAGE_NOTIFICATION_RINGTONE)] = STREAM_MUSIC;
+
+    streamMap[make_pair(CONTENT_TYPE_MUSIC, STREAM_USAGE_UNKNOWN)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_MUSIC, STREAM_USAGE_MEDIA)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_MUSIC, STREAM_USAGE_VOICE_COMMUNICATION)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_MUSIC, STREAM_USAGE_VOICE_ASSISTANT)] = STREAM_VOICE_ASSISTANT;
+    streamMap[make_pair(CONTENT_TYPE_MUSIC, STREAM_USAGE_NOTIFICATION_RINGTONE)] = STREAM_RING;
+
+    streamMap[make_pair(CONTENT_TYPE_MOVIE, STREAM_USAGE_UNKNOWN)] = STREAM_MEDIA;
+    streamMap[make_pair(CONTENT_TYPE_MOVIE, STREAM_USAGE_MEDIA)] = STREAM_MEDIA;
+    streamMap[make_pair(CONTENT_TYPE_MOVIE, STREAM_USAGE_VOICE_COMMUNICATION)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_MOVIE, STREAM_USAGE_VOICE_ASSISTANT)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_MOVIE, STREAM_USAGE_NOTIFICATION_RINGTONE)] = STREAM_MUSIC;
+
+    streamMap[make_pair(CONTENT_TYPE_SONIFICATION, STREAM_USAGE_UNKNOWN)] = STREAM_NOTIFICATION;
+    streamMap[make_pair(CONTENT_TYPE_SONIFICATION, STREAM_USAGE_MEDIA)] = STREAM_NOTIFICATION;
+    streamMap[make_pair(CONTENT_TYPE_SONIFICATION, STREAM_USAGE_VOICE_COMMUNICATION)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_SONIFICATION, STREAM_USAGE_VOICE_ASSISTANT)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_SONIFICATION, STREAM_USAGE_NOTIFICATION_RINGTONE)] = STREAM_MUSIC;
+
+    streamMap[make_pair(CONTENT_TYPE_RINGTONE, STREAM_USAGE_UNKNOWN)] = STREAM_RING;
+    streamMap[make_pair(CONTENT_TYPE_RINGTONE, STREAM_USAGE_MEDIA)] = STREAM_RING;
+    streamMap[make_pair(CONTENT_TYPE_RINGTONE, STREAM_USAGE_VOICE_COMMUNICATION)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_RINGTONE, STREAM_USAGE_VOICE_ASSISTANT)] = STREAM_MUSIC;
+    streamMap[make_pair(CONTENT_TYPE_RINGTONE, STREAM_USAGE_NOTIFICATION_RINGTONE)] = STREAM_RING;
+
+    return streamMap;
+}
+
 AudioStream::AudioStream(AudioStreamType eStreamType, AudioMode eMode) : eStreamType_(eStreamType),
                                                                          eMode_(eMode),
                                                                          state_(NEW),
@@ -63,7 +108,7 @@ State AudioStream::GetState()
     return state_;
 }
 
-int32_t AudioStream::GetAudioSessionID(uint32_t &sessionID)
+int32_t AudioStream::GetAudioSessionID(uint32_t &sessionID) const
 {
     if ((state_ == RELEASED) || (state_ == NEW)) {
         return ERR_ILLEGAL_STATE;
@@ -76,7 +121,7 @@ int32_t AudioStream::GetAudioSessionID(uint32_t &sessionID)
     return SUCCESS;
 }
 
-bool AudioStream::GetAudioTime(Timestamp &timestamp, Timestamp::Timestampbase base)
+bool AudioStream::GetAudioTime(Timestamp &timestamp, Timestamp::Timestampbase base) const
 {
     uint64_t paTimeStamp = 0;
     if (GetCurrentTimeStamp(paTimeStamp) == SUCCESS) {
@@ -94,7 +139,7 @@ bool AudioStream::GetAudioTime(Timestamp &timestamp, Timestamp::Timestampbase ba
     return false;
 }
 
-int32_t AudioStream::GetBufferSize(size_t &bufferSize)
+int32_t AudioStream::GetBufferSize(size_t &bufferSize) const
 {
     MEDIA_INFO_LOG("AudioStream: Get Buffer size");
     if (GetMinimumBufferSize(bufferSize) != 0) {
@@ -104,7 +149,7 @@ int32_t AudioStream::GetBufferSize(size_t &bufferSize)
     return SUCCESS;
 }
 
-int32_t AudioStream::GetFrameCount(uint32_t &frameCount)
+int32_t AudioStream::GetFrameCount(uint32_t &frameCount) const
 {
     MEDIA_INFO_LOG("AudioStream: Get frame count");
     if (GetMinimumFrameCount(frameCount) != 0) {
@@ -114,7 +159,7 @@ int32_t AudioStream::GetFrameCount(uint32_t &frameCount)
     return SUCCESS;
 }
 
-int32_t AudioStream::GetLatency(uint64_t &latency)
+int32_t AudioStream::GetLatency(uint64_t &latency) const
 {
     if (GetAudioLatency(latency) != SUCCESS) {
         return ERR_OPERATION_FAILED;
@@ -123,22 +168,22 @@ int32_t AudioStream::GetLatency(uint64_t &latency)
     }
 }
 
-vector<AudioSampleFormat> AudioStream::GetSupportedFormats()
+vector<AudioSampleFormat> AudioStream::GetSupportedFormats() const
 {
     return AUDIO_SUPPORTED_FORMATS;
 }
 
-vector<AudioChannel> AudioStream::GetSupportedChannels()
+vector<AudioChannel> AudioStream::GetSupportedChannels() const
 {
     return AUDIO_SUPPORTED_CHANNELS;
 }
 
-vector<AudioEncodingType> AudioStream::GetSupportedEncodingTypes()
+vector<AudioEncodingType> AudioStream::GetSupportedEncodingTypes() const
 {
     return AUDIO_SUPPORTED_ENCODING_TYPES;
 }
 
-vector<AudioSamplingRate> AudioStream::GetSupportedSamplingRates()
+vector<AudioSamplingRate> AudioStream::GetSupportedSamplingRates() const
 {
     return AUDIO_SUPPORTED_SAMPLING_RATES;
 }
@@ -326,11 +371,6 @@ size_t AudioStream::Write(uint8_t *buffer, size_t buffer_size)
         MEDIA_ERR_LOG("WriteStream fail,writeError:%{public}d", writeError);
         return ERR_WRITE_FAILED;
     }
-    if (bytesWritten < 0) {
-        MEDIA_ERR_LOG("WriteStream fail,bytesWritten:%{public}zu", bytesWritten);
-        return ERR_INVALID_WRITE;
-    }
-
     return bytesWritten;
 }
 
@@ -453,7 +493,12 @@ bool AudioStream::ReleaseAudioStream()
 
 AudioStreamType AudioStream::GetStreamType(ContentType contentType, StreamUsage streamUsage)
 {
-    AudioStreamType streamType = streamTypeMap_[contentType][streamUsage];
+    AudioStreamType streamType = STREAM_MUSIC;
+    auto pos = streamTypeMap_.find(make_pair(contentType, streamUsage));
+    if (pos != streamTypeMap_.end()) {
+        streamType = pos->second;
+    }
+
     if (streamType == STREAM_MEDIA) {
         streamType = STREAM_MUSIC;
     }
diff --git a/services/src/audio_service/client/audio_system_manager.cpp b/services/src/audio_service/client/audio_system_manager.cpp
index 0d90aa2e..72095d97 100644
--- a/services/src/audio_service/client/audio_system_manager.cpp
+++ b/services/src/audio_service/client/audio_system_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -150,7 +150,7 @@ const std::string AudioSystemManager::GetAudioParameter(const std::string key) c
     return g_sProxy->GetAudioParameter(key);
 }
 
-void AudioSystemManager::SetAudioParameter(const std::string key, const std::string value) const
+void AudioSystemManager::SetAudioParameter(const std::string &key, const std::string &value) const
 {
     g_sProxy->SetAudioParameter(key, value);
 }
@@ -341,8 +341,8 @@ int32_t AudioSystemManager::UnregisterVolumeKeyEventCallback(const int32_t clien
     return ret;
 }
 
-// Below stub implemention is added to handle compilation error in call manager
-// Once call manager adapt to new interrupt implementation, this will be rmeoved
+// Below stub implementation is added to handle compilation error in call manager
+// Once call manager adapt to new interrupt implementation, this will be removed
 int32_t AudioSystemManager::SetAudioManagerCallback(const AudioSystemManager::AudioVolumeType streamType,
                                                     const std::shared_ptr<AudioManagerCallback> &callback)
 {
diff --git a/services/src/audio_service/server/audio_manager_stub.cpp b/services/src/audio_service/server/audio_manager_stub.cpp
index 3d9790c1..1813cc60 100644
--- a/services/src/audio_service/server/audio_manager_stub.cpp
+++ b/services/src/audio_service/server/audio_manager_stub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/src/audio_service/server/audio_server.cpp b/services/src/audio_service/server/audio_server.cpp
index efdfbc1a..83bc8486 100644
--- a/services/src/audio_service/server/audio_server.cpp
+++ b/services/src/audio_service/server/audio_server.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -86,13 +86,13 @@ void AudioServer::OnStop()
     MEDIA_DEBUG_LOG("AudioService OnStop");
 }
 
-void AudioServer::SetAudioParameter(const std::string key, const std::string value)
+void AudioServer::SetAudioParameter(const std::string &key, const std::string &value)
 {
     MEDIA_DEBUG_LOG("server: set audio parameter");
     AudioServer::audioParameters[key] = value;
 }
 
-const std::string AudioServer::GetAudioParameter(const std::string key)
+const std::string AudioServer::GetAudioParameter(const std::string &key)
 {
     MEDIA_DEBUG_LOG("server: get audio parameter");
 
@@ -141,7 +141,7 @@ int32_t AudioServer::SetMicrophoneMute(bool isMute)
 {
     AudioCapturerSource *audioCapturerSourceInstance = AudioCapturerSource::GetInstance();
 
-    if (audioCapturerSourceInstance->capturerInited_ == false) {
+    if (!audioCapturerSourceInstance->capturerInited_) {
             MEDIA_INFO_LOG("Capturer is not initialized. Set the flag mute state flag");
             AudioCapturerSource::micMuteState_ = isMute;
             return 0;
@@ -155,7 +155,7 @@ bool AudioServer::IsMicrophoneMute()
     AudioCapturerSource *audioCapturerSourceInstance = AudioCapturerSource::GetInstance();
     bool isMute = false;
 
-    if (audioCapturerSourceInstance->capturerInited_ == false) {
+    if (!audioCapturerSourceInstance->capturerInited_) {
         MEDIA_INFO_LOG("Capturer is not initialized. Get the mic mute state flag value!");
         return AudioCapturerSource::micMuteState_;
     }
@@ -172,13 +172,13 @@ int32_t AudioServer::SetAudioScene(AudioScene audioScene)
     AudioCapturerSource *audioCapturerSourceInstance = AudioCapturerSource::GetInstance();
     AudioRendererSink *audioRendererSinkInstance = AudioRendererSink::GetInstance();
 
-    if (audioCapturerSourceInstance->capturerInited_ == false) {
+    if (!audioCapturerSourceInstance->capturerInited_) {
         MEDIA_WARNING_LOG("Capturer is not initialized.");
     } else {
         audioCapturerSourceInstance->SetAudioScene(audioScene);
     }
 
-    if (audioRendererSinkInstance->rendererInited_ == false) {
+    if (!audioRendererSinkInstance->rendererInited_) {
         MEDIA_WARNING_LOG("Renderer is not initialized.");
     } else {
         audioRendererSinkInstance->SetAudioScene(audioScene);
diff --git a/services/test/audio_capturer_test.cpp b/services/test/audio_capturer_test.cpp
index a20b8349..15fdd497 100644
--- a/services/test/audio_capturer_test.cpp
+++ b/services/test/audio_capturer_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/test/audio_interrupt_test.cpp b/services/test/audio_interrupt_test.cpp
index a7d7018a..38b8563e 100644
--- a/services/test/audio_interrupt_test.cpp
+++ b/services/test/audio_interrupt_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/test/audio_interrupt_test.h b/services/test/audio_interrupt_test.h
index b8471eb6..ac1f5d9d 100644
--- a/services/test/audio_interrupt_test.h
+++ b/services/test/audio_interrupt_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/test/audio_opensles_test.cpp b/services/test/audio_opensles_test.cpp
index 74df709e..66e240f8 100644
--- a/services/test/audio_opensles_test.cpp
+++ b/services/test/audio_opensles_test.cpp
@@ -1,301 +1,301 @@
-/*
- * Copyright (C) 2022 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 <OpenSLES.h>
-#include <OpenSLES_OpenHarmony.h>
-#include <OpenSLES_Platform.h>
-#include "media_log.h"
-#include <iostream>
-#include "pcm2wav.h"
-#include <unistd.h>
-
-using namespace std;
-
-static void BuqqerQueueCallback (SLOHBufferQueueItf bufferQueueItf, void *pContext, SLuint32 size);
-
-static void PlayerStart (SLPlayItf playItf, SLOHBufferQueueItf bufferQueueItf, FILE *wavFile);
-
-static void PlayerStop (SLPlayItf playItf, SLOHBufferQueueItf bufferQueueItf);
-
-static void OpenSlTest();
-
-static void OpenSlTestConcurrent();
-
-FILE *wavFile_ = nullptr;
-FILE *wavFile1_ = nullptr;
-FILE *wavFile2_ = nullptr;
-wav_hdr wavHeader_;
-wav_hdr wavHeader1_;
-wav_hdr wavHeader2_;
-SLObjectItf engineObject = nullptr;
-SLObjectItf outputMixObject = nullptr;
-SLPlayItf playItf;
-SLPlayItf playItf1;
-SLPlayItf playItf2;
-SLVolumeItf volumeItf1;
-SLVolumeItf volumeItf2;
-SLOHBufferQueueItf bufferQueueItf;
-SLOHBufferQueueItf bufferQueueItf1;
-SLOHBufferQueueItf bufferQueueItf2;
-SLObjectItf pcmPlayerObject = nullptr;
-SLObjectItf pcmPlayerObject1 = nullptr;
-SLObjectItf pcmPlayerObject2 = nullptr;
-
-int main(int argc, char *argv[])
-{
-    if (argc == 4) {
-        size_t headerSize = sizeof(wav_hdr);
-        char *inputPath = argv[1];
-        char path[PATH_MAX + 1] = {0x00};
-        if ((strlen(inputPath) > PATH_MAX) || (realpath(inputPath, path) == nullptr)) {
-            MEDIA_ERR_LOG("Invalid path");
-            return -1;
-        }
-        wavFile1_ = fopen(path, "rb");
-        if (wavFile1_ == nullptr) {
-            MEDIA_INFO_LOG("AudioRendererTest: Unable to open wave file");
-            return -1;
-        }
-        fread(&wavHeader1_, 1, headerSize, wavFile1_);
-        
-        headerSize = sizeof(wav_hdr);
-        inputPath = argv[2];
-        if ((strlen(inputPath) > PATH_MAX) || (realpath(inputPath, path) == nullptr)) {
-            MEDIA_ERR_LOG("Invalid path");
-            return -1;
-        }
-        wavFile2_ = fopen(path, "rb");
-        if (wavFile2_ == nullptr) {
-            MEDIA_INFO_LOG("AudioRendererTest: Unable to open wave file");
-            return -1;
-        }
-        fread(&wavHeader2_, 1, headerSize, wavFile2_);
-        
-        OpenSlTestConcurrent();
-        
-        while (!feof(wavFile1_) || !feof(wavFile2_)) {
-            sleep(1);
-        }
-        
-        PlayerStop(playItf1, bufferQueueItf1);
-        PlayerStop(playItf2, bufferQueueItf2);
-        (*pcmPlayerObject1)->Destroy(pcmPlayerObject1);
-        (*pcmPlayerObject2)->Destroy(pcmPlayerObject2);
-        (*engineObject)->Destroy(engineObject);
-        (*outputMixObject)->Destroy(outputMixObject);
-        return 0;
-    } else {
-        if (argc < 2) {
-            return -1;
-        }
-        size_t headerSize = sizeof(wav_hdr);
-        char *inputPath = argv[1];
-        char path[PATH_MAX + 1] = {0x00};
-        if ((strlen(inputPath) > PATH_MAX) || (realpath(inputPath, path) == nullptr)) {
-            MEDIA_ERR_LOG("Invalid path");
-            return -1;
-        }
-        wavFile_ = fopen(path, "rb");
-        if (wavFile_ == nullptr) {
-            MEDIA_INFO_LOG("AudioRendererTest: Unable to open wave file");
-            return -1;
-        }
-        fread(&wavHeader_, 1, headerSize, wavFile_);
-        
-        OpenSlTest();
-
-        while (!feof(wavFile_)) {
-            sleep(1);
-        }
-        PlayerStop(playItf, bufferQueueItf);
-        (*pcmPlayerObject)->Destroy(pcmPlayerObject);
-
-        if (argc < 3) {
-            return 0;
-        }
-        char *inputPath2 = argv[2];
-        char path2[PATH_MAX + 1] = {0x00};
-        if ((strlen(inputPath2) > PATH_MAX) || (realpath(inputPath2, path2) == nullptr)) {
-            MEDIA_ERR_LOG("Invalid path");
-            return -1;
-        }
-        wavFile_ = fopen(path2, "rb");
-        if (wavFile_ == nullptr) {
-            MEDIA_INFO_LOG("AudioRendererTest: Unable to open wave file");
-            return -1;
-        }
-        fread(&wavHeader_, 1, headerSize, wavFile_);
-        
-        OpenSlTest();
-        
-        while (!feof(wavFile_)) {
-            sleep(1);
-        }
-        PlayerStop(playItf, bufferQueueItf);
-        (*pcmPlayerObject)->Destroy(pcmPlayerObject);
-        return 0;
-    }
-}
-
-static void OpenSlTest()
-{
-    MEDIA_INFO_LOG("OpenSlTest");
-    engineObject = nullptr;
-    SLEngineItf engineEngine = nullptr;
-    SLresult result;
-    result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
-    result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
-    result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine);
-    
-    outputMixObject = nullptr;
-    result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, nullptr, nullptr);
-    (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE);
-    
-    SLDataLocator_OutputMix slOutputMix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
-    SLDataSink slSink = {&slOutputMix, nullptr};
-    SLDataLocator_BufferQueue slBufferQueue = {
-        SL_DATALOCATOR_BUFFERQUEUE,
-        0
-    };
-    SLDataFormat_PCM pcmFormat = {
-        SL_DATAFORMAT_PCM,
-        wavHeader_.NumOfChan,
-        wavHeader_.SamplesPerSec * 1000,
-        wavHeader_.bitsPerSample,
-        0,
-        0,
-        0
-    };
-    SLDataSource slSource = {&slBufferQueue, &pcmFormat};
-    result = (*engineEngine)->CreateAudioPlayer(engineEngine, &pcmPlayerObject, &slSource, &slSink, 3, nullptr, nullptr);
-    (*pcmPlayerObject)->Realize(pcmPlayerObject, SL_BOOLEAN_FALSE);
-    
-    (*pcmPlayerObject)->GetInterface(pcmPlayerObject, SL_IID_PLAY, &playItf);
-    SLVolumeItf volumeItf;
-    (*pcmPlayerObject)->GetInterface(pcmPlayerObject, SL_IID_VOLUME, &volumeItf);
-    SLmillibel pLevel = 0;
-    (*volumeItf)->GetVolumeLevel(volumeItf, &pLevel);
-    (*pcmPlayerObject)->GetInterface(pcmPlayerObject, SL_IID_OH_BUFFERQUEUE, &bufferQueueItf);
-    (*bufferQueueItf)->RegisterCallback(bufferQueueItf, BuqqerQueueCallback, wavFile_);
-    
-    PlayerStart(playItf, bufferQueueItf, wavFile_);
-}
-
-static void OpenSlTestConcurrent()
-{   
-    MEDIA_INFO_LOG("OpenSlTestConcurrent");
-    engineObject = nullptr;
-    SLEngineItf engineEngine = nullptr;
-    SLresult result;
-    
-    result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
-    result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
-    result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine);
-    
-    outputMixObject = nullptr;
-    result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, nullptr, nullptr);
-    (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE);
-    
-    SLDataLocator_OutputMix slOutputMix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
-    SLDataSink slSink = {&slOutputMix, nullptr};
-    SLDataLocator_BufferQueue slBufferQueue = {
-        SL_DATALOCATOR_BUFFERQUEUE,
-        0
-    };
-    SLDataFormat_PCM pcmFormat1 = {
-        SL_DATAFORMAT_PCM,
-        wavHeader1_.NumOfChan,
-        wavHeader1_.SamplesPerSec * 1000,
-        wavHeader1_.bitsPerSample,
-        0,
-        0,
-        0
-    };
-    SLDataFormat_PCM pcmFormat2 = {
-        SL_DATAFORMAT_PCM,
-        wavHeader2_.NumOfChan,
-        wavHeader2_.SamplesPerSec * 1000,
-        wavHeader2_.bitsPerSample,
-        0,
-        0,
-        0
-    };
-    SLDataSource slSource1 = {&slBufferQueue, &pcmFormat1};
-    SLDataSource slSource2 = {&slBufferQueue, &pcmFormat2};
-    
-    result = (*engineEngine)->CreateAudioPlayer(engineEngine, &pcmPlayerObject1, &slSource1, &slSink, 3, nullptr, nullptr);
-    (*pcmPlayerObject1)->Realize(pcmPlayerObject1, SL_BOOLEAN_FALSE);
-    
-    result = (*engineEngine)->CreateAudioPlayer(engineEngine, &pcmPlayerObject2, &slSource2, &slSink, 3, nullptr, nullptr);
-    (*pcmPlayerObject2)->Realize(pcmPlayerObject2, SL_BOOLEAN_FALSE);
-    
-    (*pcmPlayerObject1)->GetInterface(pcmPlayerObject1, SL_IID_PLAY, &playItf1);
-    (*pcmPlayerObject2)->GetInterface(pcmPlayerObject2, SL_IID_PLAY, &playItf2);
-    (*pcmPlayerObject1)->GetInterface(pcmPlayerObject1, SL_IID_VOLUME, &volumeItf1);
-    
-    SLmillibel level1 = 0;
-    (*volumeItf1)->GetMaxVolumeLevel(volumeItf1, &level1);
-    SLmillibel temp = 2;
-    level1 = (SLmillibel) (level1 / temp);
-    (*volumeItf1)->SetVolumeLevel(volumeItf1, level1);
-    (*pcmPlayerObject2)->GetInterface(pcmPlayerObject2, SL_IID_VOLUME, &volumeItf2);
-    SLmillibel level2 = 0;
-    (*volumeItf2)->GetMaxVolumeLevel(volumeItf2, &level2);
-    temp = 15;
-    level2 = (SLmillibel) (level2 / temp);
-    (*volumeItf2)->SetVolumeLevel(volumeItf2, level2);
-    
-    (*pcmPlayerObject1)->GetInterface(pcmPlayerObject1, SL_IID_OH_BUFFERQUEUE, &bufferQueueItf1);
-    (*pcmPlayerObject2)->GetInterface(pcmPlayerObject2, SL_IID_OH_BUFFERQUEUE, &bufferQueueItf2);
-    (*bufferQueueItf1)->RegisterCallback(bufferQueueItf1, BuqqerQueueCallback, wavFile1_);
-    (*bufferQueueItf2)->RegisterCallback(bufferQueueItf2, BuqqerQueueCallback, wavFile2_);
-    PlayerStart(playItf1, bufferQueueItf1, wavFile1_);
-    PlayerStart(playItf2, bufferQueueItf2, wavFile2_);
-}
-
-static void BuqqerQueueCallback (SLOHBufferQueueItf bufferQueueItf, void *pContext, SLuint32 size)
-{
-    FILE *wavFile = (FILE *)pContext;
-    if (!feof(wavFile)) {
-        SLuint8 *buffer = nullptr;
-        SLuint32 pSize = 0;
-        (*bufferQueueItf)->GetBuffer(bufferQueueItf, &buffer, pSize);
-        fread(buffer, 1, size, wavFile);
-        (*bufferQueueItf)->Enqueue(bufferQueueItf, buffer, size);
-    }
-    return;
-}
-
-static void PlayerStart (SLPlayItf playItf, SLOHBufferQueueItf bufferQueueItf, FILE *wavFile)
-{
-    MEDIA_INFO_LOG("PlayerStart");
-    (*playItf)->SetPlayState(playItf, SL_PLAYSTATE_PLAYING);
-    if (!feof(wavFile)) {
-        SLuint8* buffer = nullptr;
-        SLuint32 pSize = 0;
-        (*bufferQueueItf)->GetBuffer(bufferQueueItf, &buffer, pSize);
-        fread(buffer, 1, pSize, wavFile);
-        (*bufferQueueItf)->Enqueue(bufferQueueItf, buffer, pSize);
-    }
-    return;
-}
-
-static void PlayerStop (SLPlayItf playItf, SLOHBufferQueueItf bufferQueueItf)
-{
-    MEDIA_INFO_LOG("PlayerStop");
-    (*playItf)->SetPlayState(playItf, SL_PLAYSTATE_STOPPED);
-    return;
-}
-
+/*
+ * Copyright (c) 2022 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 <OpenSLES.h>
+#include <OpenSLES_OpenHarmony.h>
+#include <OpenSLES_Platform.h>
+#include "media_log.h"
+#include <iostream>
+#include "pcm2wav.h"
+#include <unistd.h>
+
+using namespace std;
+
+static void BuqqerQueueCallback (SLOHBufferQueueItf bufferQueueItf, void *pContext, SLuint32 size);
+
+static void PlayerStart (SLPlayItf playItf, SLOHBufferQueueItf bufferQueueItf, FILE *wavFile);
+
+static void PlayerStop (SLPlayItf playItf, SLOHBufferQueueItf bufferQueueItf);
+
+static void OpenSlTest();
+
+static void OpenSlTestConcurrent();
+
+FILE *wavFile_ = nullptr;
+FILE *wavFile1_ = nullptr;
+FILE *wavFile2_ = nullptr;
+wav_hdr wavHeader_;
+wav_hdr wavHeader1_;
+wav_hdr wavHeader2_;
+SLObjectItf engineObject = nullptr;
+SLObjectItf outputMixObject = nullptr;
+SLPlayItf playItf;
+SLPlayItf playItf1;
+SLPlayItf playItf2;
+SLVolumeItf volumeItf1;
+SLVolumeItf volumeItf2;
+SLOHBufferQueueItf bufferQueueItf;
+SLOHBufferQueueItf bufferQueueItf1;
+SLOHBufferQueueItf bufferQueueItf2;
+SLObjectItf pcmPlayerObject = nullptr;
+SLObjectItf pcmPlayerObject1 = nullptr;
+SLObjectItf pcmPlayerObject2 = nullptr;
+
+int main(int argc, char *argv[])
+{
+    if (argc == 4) {
+        size_t headerSize = sizeof(wav_hdr);
+        char *inputPath = argv[1];
+        char path[PATH_MAX + 1] = {0x00};
+        if ((strlen(inputPath) > PATH_MAX) || (realpath(inputPath, path) == nullptr)) {
+            MEDIA_ERR_LOG("Invalid path");
+            return -1;
+        }
+        wavFile1_ = fopen(path, "rb");
+        if (wavFile1_ == nullptr) {
+            MEDIA_INFO_LOG("AudioRendererTest: Unable to open wave file");
+            return -1;
+        }
+        fread(&wavHeader1_, 1, headerSize, wavFile1_);
+        
+        headerSize = sizeof(wav_hdr);
+        inputPath = argv[2];
+        if ((strlen(inputPath) > PATH_MAX) || (realpath(inputPath, path) == nullptr)) {
+            MEDIA_ERR_LOG("Invalid path");
+            return -1;
+        }
+        wavFile2_ = fopen(path, "rb");
+        if (wavFile2_ == nullptr) {
+            MEDIA_INFO_LOG("AudioRendererTest: Unable to open wave file");
+            return -1;
+        }
+        fread(&wavHeader2_, 1, headerSize, wavFile2_);
+        
+        OpenSlTestConcurrent();
+        
+        while (!feof(wavFile1_) || !feof(wavFile2_)) {
+            sleep(1);
+        }
+        
+        PlayerStop(playItf1, bufferQueueItf1);
+        PlayerStop(playItf2, bufferQueueItf2);
+        (*pcmPlayerObject1)->Destroy(pcmPlayerObject1);
+        (*pcmPlayerObject2)->Destroy(pcmPlayerObject2);
+        (*engineObject)->Destroy(engineObject);
+        (*outputMixObject)->Destroy(outputMixObject);
+        return 0;
+    } else {
+        if (argc < 2) {
+            return -1;
+        }
+        size_t headerSize = sizeof(wav_hdr);
+        char *inputPath = argv[1];
+        char path[PATH_MAX + 1] = {0x00};
+        if ((strlen(inputPath) > PATH_MAX) || (realpath(inputPath, path) == nullptr)) {
+            MEDIA_ERR_LOG("Invalid path");
+            return -1;
+        }
+        wavFile_ = fopen(path, "rb");
+        if (wavFile_ == nullptr) {
+            MEDIA_INFO_LOG("AudioRendererTest: Unable to open wave file");
+            return -1;
+        }
+        fread(&wavHeader_, 1, headerSize, wavFile_);
+        
+        OpenSlTest();
+
+        while (!feof(wavFile_)) {
+            sleep(1);
+        }
+        PlayerStop(playItf, bufferQueueItf);
+        (*pcmPlayerObject)->Destroy(pcmPlayerObject);
+
+        if (argc < 3) {
+            return 0;
+        }
+        char *inputPath2 = argv[2];
+        char path2[PATH_MAX + 1] = {0x00};
+        if ((strlen(inputPath2) > PATH_MAX) || (realpath(inputPath2, path2) == nullptr)) {
+            MEDIA_ERR_LOG("Invalid path");
+            return -1;
+        }
+        wavFile_ = fopen(path2, "rb");
+        if (wavFile_ == nullptr) {
+            MEDIA_INFO_LOG("AudioRendererTest: Unable to open wave file");
+            return -1;
+        }
+        fread(&wavHeader_, 1, headerSize, wavFile_);
+        
+        OpenSlTest();
+        
+        while (!feof(wavFile_)) {
+            sleep(1);
+        }
+        PlayerStop(playItf, bufferQueueItf);
+        (*pcmPlayerObject)->Destroy(pcmPlayerObject);
+        return 0;
+    }
+}
+
+static void OpenSlTest()
+{
+    MEDIA_INFO_LOG("OpenSlTest");
+    engineObject = nullptr;
+    SLEngineItf engineEngine = nullptr;
+    SLresult result;
+    result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
+    result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
+    result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine);
+    
+    outputMixObject = nullptr;
+    result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, nullptr, nullptr);
+    (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE);
+    
+    SLDataLocator_OutputMix slOutputMix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
+    SLDataSink slSink = {&slOutputMix, nullptr};
+    SLDataLocator_BufferQueue slBufferQueue = {
+        SL_DATALOCATOR_BUFFERQUEUE,
+        0
+    };
+    SLDataFormat_PCM pcmFormat = {
+        SL_DATAFORMAT_PCM,
+        wavHeader_.NumOfChan,
+        wavHeader_.SamplesPerSec * 1000,
+        wavHeader_.bitsPerSample,
+        0,
+        0,
+        0
+    };
+    SLDataSource slSource = {&slBufferQueue, &pcmFormat};
+    result = (*engineEngine)->CreateAudioPlayer(engineEngine, &pcmPlayerObject, &slSource, &slSink, 3, nullptr, nullptr);
+    (*pcmPlayerObject)->Realize(pcmPlayerObject, SL_BOOLEAN_FALSE);
+    
+    (*pcmPlayerObject)->GetInterface(pcmPlayerObject, SL_IID_PLAY, &playItf);
+    SLVolumeItf volumeItf;
+    (*pcmPlayerObject)->GetInterface(pcmPlayerObject, SL_IID_VOLUME, &volumeItf);
+    SLmillibel pLevel = 0;
+    (*volumeItf)->GetVolumeLevel(volumeItf, &pLevel);
+    (*pcmPlayerObject)->GetInterface(pcmPlayerObject, SL_IID_OH_BUFFERQUEUE, &bufferQueueItf);
+    (*bufferQueueItf)->RegisterCallback(bufferQueueItf, BuqqerQueueCallback, wavFile_);
+    
+    PlayerStart(playItf, bufferQueueItf, wavFile_);
+}
+
+static void OpenSlTestConcurrent()
+{   
+    MEDIA_INFO_LOG("OpenSlTestConcurrent");
+    engineObject = nullptr;
+    SLEngineItf engineEngine = nullptr;
+    SLresult result;
+    
+    result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
+    result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
+    result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine);
+    
+    outputMixObject = nullptr;
+    result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, nullptr, nullptr);
+    (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE);
+    
+    SLDataLocator_OutputMix slOutputMix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
+    SLDataSink slSink = {&slOutputMix, nullptr};
+    SLDataLocator_BufferQueue slBufferQueue = {
+        SL_DATALOCATOR_BUFFERQUEUE,
+        0
+    };
+    SLDataFormat_PCM pcmFormat1 = {
+        SL_DATAFORMAT_PCM,
+        wavHeader1_.NumOfChan,
+        wavHeader1_.SamplesPerSec * 1000,
+        wavHeader1_.bitsPerSample,
+        0,
+        0,
+        0
+    };
+    SLDataFormat_PCM pcmFormat2 = {
+        SL_DATAFORMAT_PCM,
+        wavHeader2_.NumOfChan,
+        wavHeader2_.SamplesPerSec * 1000,
+        wavHeader2_.bitsPerSample,
+        0,
+        0,
+        0
+    };
+    SLDataSource slSource1 = {&slBufferQueue, &pcmFormat1};
+    SLDataSource slSource2 = {&slBufferQueue, &pcmFormat2};
+    
+    result = (*engineEngine)->CreateAudioPlayer(engineEngine, &pcmPlayerObject1, &slSource1, &slSink, 3, nullptr, nullptr);
+    (*pcmPlayerObject1)->Realize(pcmPlayerObject1, SL_BOOLEAN_FALSE);
+    
+    result = (*engineEngine)->CreateAudioPlayer(engineEngine, &pcmPlayerObject2, &slSource2, &slSink, 3, nullptr, nullptr);
+    (*pcmPlayerObject2)->Realize(pcmPlayerObject2, SL_BOOLEAN_FALSE);
+    
+    (*pcmPlayerObject1)->GetInterface(pcmPlayerObject1, SL_IID_PLAY, &playItf1);
+    (*pcmPlayerObject2)->GetInterface(pcmPlayerObject2, SL_IID_PLAY, &playItf2);
+    (*pcmPlayerObject1)->GetInterface(pcmPlayerObject1, SL_IID_VOLUME, &volumeItf1);
+    
+    SLmillibel level1 = 0;
+    (*volumeItf1)->GetMaxVolumeLevel(volumeItf1, &level1);
+    SLmillibel temp = 2;
+    level1 = (SLmillibel) (level1 / temp);
+    (*volumeItf1)->SetVolumeLevel(volumeItf1, level1);
+    (*pcmPlayerObject2)->GetInterface(pcmPlayerObject2, SL_IID_VOLUME, &volumeItf2);
+    SLmillibel level2 = 0;
+    (*volumeItf2)->GetMaxVolumeLevel(volumeItf2, &level2);
+    temp = 15;
+    level2 = (SLmillibel) (level2 / temp);
+    (*volumeItf2)->SetVolumeLevel(volumeItf2, level2);
+    
+    (*pcmPlayerObject1)->GetInterface(pcmPlayerObject1, SL_IID_OH_BUFFERQUEUE, &bufferQueueItf1);
+    (*pcmPlayerObject2)->GetInterface(pcmPlayerObject2, SL_IID_OH_BUFFERQUEUE, &bufferQueueItf2);
+    (*bufferQueueItf1)->RegisterCallback(bufferQueueItf1, BuqqerQueueCallback, wavFile1_);
+    (*bufferQueueItf2)->RegisterCallback(bufferQueueItf2, BuqqerQueueCallback, wavFile2_);
+    PlayerStart(playItf1, bufferQueueItf1, wavFile1_);
+    PlayerStart(playItf2, bufferQueueItf2, wavFile2_);
+}
+
+static void BuqqerQueueCallback (SLOHBufferQueueItf bufferQueueItf, void *pContext, SLuint32 size)
+{
+    FILE *wavFile = (FILE *)pContext;
+    if (!feof(wavFile)) {
+        SLuint8 *buffer = nullptr;
+        SLuint32 pSize = 0;
+        (*bufferQueueItf)->GetBuffer(bufferQueueItf, &buffer, pSize);
+        fread(buffer, 1, size, wavFile);
+        (*bufferQueueItf)->Enqueue(bufferQueueItf, buffer, size);
+    }
+    return;
+}
+
+static void PlayerStart (SLPlayItf playItf, SLOHBufferQueueItf bufferQueueItf, FILE *wavFile)
+{
+    MEDIA_INFO_LOG("PlayerStart");
+    (*playItf)->SetPlayState(playItf, SL_PLAYSTATE_PLAYING);
+    if (!feof(wavFile)) {
+        SLuint8* buffer = nullptr;
+        SLuint32 pSize = 0;
+        (*bufferQueueItf)->GetBuffer(bufferQueueItf, &buffer, pSize);
+        fread(buffer, 1, pSize, wavFile);
+        (*bufferQueueItf)->Enqueue(bufferQueueItf, buffer, pSize);
+    }
+    return;
+}
+
+static void PlayerStop (SLPlayItf playItf, SLOHBufferQueueItf bufferQueueItf)
+{
+    MEDIA_INFO_LOG("PlayerStop");
+    (*playItf)->SetPlayState(playItf, SL_PLAYSTATE_STOPPED);
+    return;
+}
+
diff --git a/services/test/audio_policy_test.cpp b/services/test/audio_policy_test.cpp
index c7b1c00c..6e38a7db 100644
--- a/services/test/audio_policy_test.cpp
+++ b/services/test/audio_policy_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -61,6 +61,8 @@ static void PrintUsage(void)
     cout << "-u\n\t Checks if the Microphone is muted " << endl << endl;
     cout << "-R\n\tSets RingerMode" << endl << endl;
     cout << "-r\n\tGets RingerMode status" << endl << endl;
+    cout << "-C\n\tSets AudioScene" << endl << endl;
+    cout << "-c\n\tGets AudioScene status" << endl << endl;
     cout << "-s\n\tGet Stream Status" << endl << endl;
     cout << "AUTHOR" << endl << endl;
     cout << "\tWritten by Sajeesh Sidharthan and Anurup M" << endl << endl;
@@ -163,6 +165,19 @@ static void HandleRingerMode(char option)
     }
 }
 
+static void HandleAudioScene(char option)
+{
+    AudioSystemManager *audioSystemMgr = AudioSystemManager::GetInstance();
+    if (option == 'c') {
+        int scene = static_cast<int32_t>(audioSystemMgr->GetAudioScene());
+        cout << "Get Audio Scene : " << scene << endl;
+    } else {
+        int scene = strtol(optarg, nullptr, AudioPolicyTest::OPT_ARG_BASE);
+        cout << "Set Audio Scene : " << scene << endl;
+        audioSystemMgr->SetAudioScene(static_cast<AudioScene>(scene));
+    }
+}
+
 static void NoValueError()
 {
     char option[AudioPolicyTest::OPT_SHORT_LEN];
@@ -199,7 +214,7 @@ int main(int argc, char* argv[])
     }
 
     int streamType = static_cast<int32_t>(AudioSystemManager::AudioVolumeType::STREAM_MUSIC);
-    while ((opt = getopt(argc, argv, ":V:U:S:D:M:R:d:s:vmru")) != -1) {
+    while ((opt = getopt(argc, argv, ":V:U:S:D:M:R:C:d:s:vmruc")) != -1) {
         switch (opt) {
             case 'V':
             case 'v':
@@ -229,6 +244,10 @@ int main(int argc, char* argv[])
             case 'r':
                 HandleRingerMode(opt);
                 break;
+            case 'C':
+            case 'c':
+                HandleAudioScene(opt);
+                break;
             case ':':
                 NoValueError();
                 break;
diff --git a/services/test/audio_render_mode_callback_test.cpp b/services/test/audio_render_mode_callback_test.cpp
index 18bb4b33..5e4a3bb9 100644
--- a/services/test/audio_render_mode_callback_test.cpp
+++ b/services/test/audio_render_mode_callback_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/test/audio_renderer_test.cpp b/services/test/audio_renderer_test.cpp
index 75722578..3958e29e 100644
--- a/services/test/audio_renderer_test.cpp
+++ b/services/test/audio_renderer_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -286,6 +286,7 @@ public:
 
         if (audioRenderer == nullptr) {
             MEDIA_ERR_LOG("AudioRendererTest: Create failed");
+            fclose(wavFile);
             return false;
         }
 
@@ -294,6 +295,7 @@ public:
         ret = audioRenderer->SetRendererCallback(cb1);
         if (ret) {
             MEDIA_ERR_LOG("AudioRendererTest: SetRendererCallback failed %{public}d", ret);
+            fclose(wavFile);
             return false;
         }
 
diff --git a/services/test/audio_voip_test.cpp b/services/test/audio_voip_test.cpp
index 9bc9507c..6621fb4a 100644
--- a/services/test/audio_voip_test.cpp
+++ b/services/test/audio_voip_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -278,11 +278,23 @@ int main(int argc, char *argv[])
     MEDIA_INFO_LOG("AudioVoIPTest: capturer test path = %{public}s",
         argv[AudioTestConstants::ARGS_INDEX_CAPTURER_TEST_PATH]);
 
-    AudioVoIPTest *renderTestObj = new AudioVoIPTest();
+    AudioVoIPTest *renderTestObj = new(std::nothrow) AudioVoIPTest();
+    if (!renderTestObj) {
+        MEDIA_ERR_LOG("AudioVoIPTest: create renderer object failed");
+        return 0;
+    }
+
+    AudioVoIPTest *captureTestObj = new(std::nothrow) AudioVoIPTest();
+    if (!captureTestObj) {
+        MEDIA_ERR_LOG("AudioVoIPTest: create capturer object failed");
+        delete renderTestObj;
+        renderTestObj = nullptr;
+        return 0;
+    }
+
     std::thread renderThread(&AudioVoIPTest::TestPlayback, renderTestObj,
                              argv[AudioTestConstants::ARGS_INDEX_RENDERER_TEST_PATH]);
 
-    AudioVoIPTest *captureTestObj = new AudioVoIPTest();
     std::thread captureThread(&AudioVoIPTest::TestRecording, captureTestObj,
                               argv[AudioTestConstants::ARGS_INDEX_CAPTURER_TEST_PATH]);
 
@@ -290,7 +302,9 @@ int main(int argc, char *argv[])
     captureThread.join();
 
     delete renderTestObj;
+    renderTestObj = nullptr;
     delete captureTestObj;
+    captureTestObj = nullptr;
 
     return 0;
 }
diff --git a/services/test/interrupt_multi_renderer_test.cpp b/services/test/interrupt_multi_renderer_test.cpp
index 2f6d974d..9df589d2 100644
--- a/services/test/interrupt_multi_renderer_test.cpp
+++ b/services/test/interrupt_multi_renderer_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/test/interrupt_multi_renderer_test.h b/services/test/interrupt_multi_renderer_test.h
index 2fc42b95..79dbbda4 100644
--- a/services/test/interrupt_multi_renderer_test.h
+++ b/services/test/interrupt_multi_renderer_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/test/pcm2wav.h b/services/test/pcm2wav.h
index 55aec245..988c5aa4 100644
--- a/services/test/pcm2wav.h
+++ b/services/test/pcm2wav.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/test/playback_test.cpp b/services/test/playback_test.cpp
index 26dfb356..80048fba 100644
--- a/services/test/playback_test.cpp
+++ b/services/test/playback_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -74,7 +74,7 @@ static int32_t InitPlayback(std::unique_ptr<AudioServiceClient> &client, AudioSt
 int32_t StartPlayback(std::unique_ptr<AudioServiceClient> &client, FILE *wavFile)
 {
     uint8_t* buffer = nullptr;
-    int32_t n = 2;
+    size_t n = 2;
     size_t bytesToWrite = 0;
     size_t bytesWritten = 0;
     size_t minBytes = 4;
diff --git a/services/test/record_test.cpp b/services/test/record_test.cpp
index fdaa8679..d75b4290 100644
--- a/services/test/record_test.cpp
+++ b/services/test/record_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/test/BUILD.gn b/test/BUILD.gn
index effa1e88..3fee7fea 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/test/moduletest/audiopolicy/1.0/include/audio_policy_test.h b/test/moduletest/audiopolicy/1.0/include/audio_policy_test.h
index c51995bb..a7ab2a18 100644
--- a/test/moduletest/audiopolicy/1.0/include/audio_policy_test.h
+++ b/test/moduletest/audiopolicy/1.0/include/audio_policy_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/test/moduletest/audiopolicy/1.0/src/audio_policy_test.cpp b/test/moduletest/audiopolicy/1.0/src/audio_policy_test.cpp
index f5e0343d..af2722e5 100644
--- a/test/moduletest/audiopolicy/1.0/src/audio_policy_test.cpp
+++ b/test/moduletest/audiopolicy/1.0/src/audio_policy_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/test/moduletest/audiopolicy/BUILD.gn b/test/moduletest/audiopolicy/BUILD.gn
index 3f67288c..7b05ebf8 100644
--- a/test/moduletest/audiopolicy/BUILD.gn
+++ b/test/moduletest/audiopolicy/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/test/resource/audio_renderer/ohos_test.xml b/test/resource/audio_renderer/ohos_test.xml
index 2240cfe5..9b3d5300 100644
--- a/test/resource/audio_renderer/ohos_test.xml
+++ b/test/resource/audio_renderer/ohos_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2021-2022 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.
diff --git a/test/resource/audio_renderer/test_audiofile/test_44100_2.wav b/test/resource/audio_renderer/test_audiofile/test_44100_2.wav
index a04c1cdb..70dea75a 100644
Binary files a/test/resource/audio_renderer/test_audiofile/test_44100_2.wav and b/test/resource/audio_renderer/test_audiofile/test_44100_2.wav differ
diff --git a/test/unittest/capturer_test/BUILD.gn b/test/unittest/capturer_test/BUILD.gn
index 93a2f1c5..33412a5f 100644
--- a/test/unittest/capturer_test/BUILD.gn
+++ b/test/unittest/capturer_test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/test/unittest/capturer_test/include/audio_capturer_unit_test.h b/test/unittest/capturer_test/include/audio_capturer_unit_test.h
index 3dc93b0f..89572d42 100644
--- a/test/unittest/capturer_test/include/audio_capturer_unit_test.h
+++ b/test/unittest/capturer_test/include/audio_capturer_unit_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef AUDIO_CAPTURER_UNIT_TEST_H
 #define AUDIO_CAPTURER_UNIT_TEST_H
 
diff --git a/test/unittest/capturer_test/src/audio_capturer_unit_test.cpp b/test/unittest/capturer_test/src/audio_capturer_unit_test.cpp
index 64f046cf..386331b5 100644
--- a/test/unittest/capturer_test/src/audio_capturer_unit_test.cpp
+++ b/test/unittest/capturer_test/src/audio_capturer_unit_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/test/unittest/manager_test/BUILD.gn b/test/unittest/manager_test/BUILD.gn
index c6952e3d..ad345615 100644
--- a/test/unittest/manager_test/BUILD.gn
+++ b/test/unittest/manager_test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/test/unittest/manager_test/include/audio_manager_unit_test.h b/test/unittest/manager_test/include/audio_manager_unit_test.h
index 1c1ae344..3968ee2f 100644
--- a/test/unittest/manager_test/include/audio_manager_unit_test.h
+++ b/test/unittest/manager_test/include/audio_manager_unit_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef AUDIO_MANAGER_UNIT_TEST_H
 #define AUDIO_MANAGER_UNIT_TEST_H
 
diff --git a/test/unittest/manager_test/src/audio_manager_unit_test.cpp b/test/unittest/manager_test/src/audio_manager_unit_test.cpp
index fc10bfea..8dd69ef3 100644
--- a/test/unittest/manager_test/src/audio_manager_unit_test.cpp
+++ b/test/unittest/manager_test/src/audio_manager_unit_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/test/unittest/opensles_test/BUILD.gn b/test/unittest/opensles_test/BUILD.gn
index 377d2075..8e564351 100644
--- a/test/unittest/opensles_test/BUILD.gn
+++ b/test/unittest/opensles_test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 2022 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
diff --git a/test/unittest/opensles_test/include/audio_opensles_unit_test.h b/test/unittest/opensles_test/include/audio_opensles_unit_test.h
index 1587de35..69c9a2bc 100644
--- a/test/unittest/opensles_test/include/audio_opensles_unit_test.h
+++ b/test/unittest/opensles_test/include/audio_opensles_unit_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/test/unittest/opensles_test/src/audio_opensles_unit_test.cpp b/test/unittest/opensles_test/src/audio_opensles_unit_test.cpp
index 31b46af8..b55c6c23 100644
--- a/test/unittest/opensles_test/src/audio_opensles_unit_test.cpp
+++ b/test/unittest/opensles_test/src/audio_opensles_unit_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
diff --git a/test/unittest/renderer_test/BUILD.gn b/test/unittest/renderer_test/BUILD.gn
index df0afb12..47f164ec 100644
--- a/test/unittest/renderer_test/BUILD.gn
+++ b/test/unittest/renderer_test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/test/unittest/renderer_test/include/audio_renderer_unit_test.h b/test/unittest/renderer_test/include/audio_renderer_unit_test.h
index b683348b..08f3a429 100644
--- a/test/unittest/renderer_test/include/audio_renderer_unit_test.h
+++ b/test/unittest/renderer_test/include/audio_renderer_unit_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef AUDIO_RENDERER_UNIT_TEST_H
 #define AUDIO_RENDERER_UNIT_TEST_H
 
diff --git a/test/unittest/renderer_test/src/audio_renderer_unit_test.cpp b/test/unittest/renderer_test/src/audio_renderer_unit_test.cpp
index 9e3c6df9..5b21d511 100644
--- a/test/unittest/renderer_test/src/audio_renderer_unit_test.cpp
+++ b/test/unittest/renderer_test/src/audio_renderer_unit_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/test/unittest/volume_change_test/BUILD.gn b/test/unittest/volume_change_test/BUILD.gn
index 85f9d487..cb63bba8 100644
--- a/test/unittest/volume_change_test/BUILD.gn
+++ b/test/unittest/volume_change_test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/test/unittest/volume_change_test/include/audio_volume_change_unit_test.h b/test/unittest/volume_change_test/include/audio_volume_change_unit_test.h
index d52b980e..ee344ddf 100644
--- a/test/unittest/volume_change_test/include/audio_volume_change_unit_test.h
+++ b/test/unittest/volume_change_test/include/audio_volume_change_unit_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/test/unittest/volume_change_test/src/audio_volume_change_unit_test.cpp b/test/unittest/volume_change_test/src/audio_volume_change_unit_test.cpp
index a4fb940e..47b5d86a 100644
--- a/test/unittest/volume_change_test/src/audio_volume_change_unit_test.cpp
+++ b/test/unittest/volume_change_test/src/audio_volume_change_unit_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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