ImsMedia update to support presubmit

- core, config, protocol submodule static libs are created
- libimsmedia shared lib accesses these static libs
- ImsMediaNativeTests accesses these static libs
- Folder structure updated accordingly

Bug: 258455118
Test: Verified MO and MT calls and atest ImsMediaNativeTests
Change-Id: I06e98c7d3dded536ec8a78fc332f9213f4279269

235 files changed, 346 insertions, 236 deletions

diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp
index 8a43d29e..3de65a46 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/Android.bp
@@ -1,137 +1,41 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_library_headers {
-    name: "libimsmedia_header",
-    export_include_dirs: [
-        "include",
-        "include/nodes",
-        "include/utils",
-        "rtpservice",
-        "jni",
-    ],
-
-}
-
-cc_library_headers {
-    name: "libimsmedia_audio_header",
-    export_include_dirs: [
-        "include/audio",
-        "include/audio/nodes",
-        "include/audio/android",
-    ],
-}
-
-cc_library_headers {
-    name: "libimsmedia_video_header",
-    export_include_dirs: [
-        "include/video",
-        "include/video/nodes",
-        "include/video/android",
-    ],
-}
-
-cc_library_headers {
-    name: "libimsmedia_text_header",
-    export_include_dirs: [
-        "include/text",
-        "include/text/nodes",
-    ],
-}
-
-cc_library_headers {
-    name: "libimsmedia_utils_header",
-    export_include_dirs: [
-        "include/utils",
-    ],
-}
-
-cc_defaults {
-    name: "libimsmedia_shared_defaults",
-    cflags: [
-    ],
-    header_libs: [
-    ],
-    include_dirs: [
-        "frameworks/native/include",
-        "frameworks/native/libs/binder/include/binder",
-        "frameworks/av/media",
-    ],
-}
-
-cc_defaults {
-    name: "libimsmedia_audio_defaults",
-    cflags: [
-    ],
-    header_libs: [
-        "libimsmedia_header",
-        "libimsmedia_audio_header",
-        "libimsmedia_config_headers",
-    ],
-}
-
-cc_defaults {
-    name: "libimsmedia_video_defaults",
-    cflags: [
-    ],
-    header_libs: [
-        "libimsmedia_header",
-        "libimsmedia_video_header",
-        "libimsmedia_config_headers",
-    ],
-    shared_libs: [
-        "libnativewindow",
-        "libcamera2ndk",
-        "libandroid"
-    ],
-    include_dirs: [
-        "frameworks/av/camera/ndk/include",
-        "frameworks/av/include",
-    ],
-}
-
-cc_defaults {
-    name: "libimsmedia_text_defaults",
-    cflags: [
-    ],
-    header_libs: [
-        "libimsmedia_header",
-        "libimsmedia_text_header",
-        "libimsmedia_config_headers",
-    ],
-}
+// Copyright (C) 2022 The Android Open Source Project
+//
+// 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.
 
 cc_library_shared {
     name: "libimsmedia",
     defaults: [
-        "librtp_defaults",
-        "libimsmedia_shared_defaults",
-        "libimsmedia_audio_defaults",
-        "libimsmedia_video_defaults",
-        "libimsmedia_text_defaults",
     ],
     srcs: [
-        "src/**/*.cpp",
-        "jni/*.cpp"
-    ],
-    local_include_dirs: [
-        "include",
+        "libimsmedia.cpp",
     ],
     static_libs: [
-        "librtpservice",
-        "librtpprotocol",
+        "libimsmedia_config",
+        "libimsmedia_core",
+        "libimsmedia_protocol",
     ],
     shared_libs: [
-        "libimsmedia_config",
+        "framework-permission-aidl-cpp",
+        "libaaudio",
+        "libandroid",
         "libandroid_runtime",
         "libbinder",
-        "libaaudio",
+        "libcamera2ndk",
         "libcutils",
+        "libjnigraphics",
         "liblog",
-        "libutils",
-        "framework-permission-aidl-cpp",
         "libmediandk",
-        "libjnigraphics",
+        "libnativewindow",
+        "libutils",
     ],
-}
+}
\ No newline at end of file
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/Android.bp
new file mode 100644
index 00000000..f73a3fa0
--- /dev/null
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/Android.bp
@@ -0,0 +1,40 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// 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.
+
+cc_library_headers {
+    name: "libimsmedia_config_headers",
+    export_include_dirs: [
+        "include",
+    ],
+}
+
+cc_defaults {
+    name: "libimsmedia_config_defaults",
+    header_libs: [
+        "libimsmedia_config_headers",
+    ],
+    srcs: [
+        "**/*.cpp",
+    ],
+}
+
+cc_library_static {
+    name: "libimsmedia_config",
+    defaults: ["libimsmedia_config_defaults"],
+    shared_libs: [
+        "libbinder",
+        "libutils",
+        "liblog",
+    ],
+}
\ No newline at end of file
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/AmrParams.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/AmrParams.h
index c421403c..c421403c 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/AmrParams.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/AmrParams.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/AudioConfig.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/AudioConfig.h
index cbe5bbdf..cbe5bbdf 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/AudioConfig.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/AudioConfig.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/EvsParams.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/EvsParams.h
index 04ab557f..04ab557f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/EvsParams.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/EvsParams.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/MediaQuality.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/MediaQuality.h
index 0c6498fc..0c6498fc 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/MediaQuality.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/MediaQuality.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/MediaQualityThreshold.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/MediaQualityThreshold.h
index 07dff806..07dff806 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/MediaQualityThreshold.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/MediaQualityThreshold.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/RtcpConfig.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/RtcpConfig.h
index be8b97b7..be8b97b7 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/RtcpConfig.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/RtcpConfig.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/RtpConfig.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/RtpConfig.h
index e4ed50c2..e4ed50c2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/RtpConfig.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/RtpConfig.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/TextConfig.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/TextConfig.h
index 6fd9db84..6fd9db84 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/TextConfig.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/TextConfig.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/VideoConfig.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/VideoConfig.h
index 5863575d..5863575d 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/include/VideoConfig.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/include/VideoConfig.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/AmrParams.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/AmrParams.cpp
index b99598a9..b99598a9 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/AmrParams.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/AmrParams.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/AudioConfig.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/AudioConfig.cpp
index d8dabb19..d8dabb19 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/AudioConfig.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/AudioConfig.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/EvsParams.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/EvsParams.cpp
index 4f2ccb06..4f2ccb06 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/EvsParams.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/EvsParams.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/MediaQuality.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/MediaQuality.cpp
index 24303dbf..24303dbf 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/MediaQuality.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/MediaQuality.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/MediaQualityThreshold.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/MediaQualityThreshold.cpp
index 1318315e..1318315e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/MediaQualityThreshold.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/MediaQualityThreshold.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/RtcpConfig.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/RtcpConfig.cpp
index dc191ba3..dc191ba3 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/RtcpConfig.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/RtcpConfig.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/RtpConfig.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/RtpConfig.cpp
index 02230830..02230830 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/RtpConfig.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/RtpConfig.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/TextConfig.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/TextConfig.cpp
index cbf4055b..cbf4055b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/TextConfig.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/TextConfig.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/VideoConfig.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/VideoConfig.cpp
index 2867457f..2867457f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/src/VideoConfig.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/config/src/VideoConfig.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/Android.bp
new file mode 100644
index 00000000..9174d10f
--- /dev/null
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/Android.bp
@@ -0,0 +1,147 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// 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.
+
+cc_library_headers {
+    name: "libimsmedia_headers",
+    export_include_dirs: [
+        "include",
+        "include/nodes",
+        "include/utils",
+    ],
+}
+
+cc_library_headers {
+    name: "libimsmedia_audio_headers",
+    export_include_dirs: [
+        "include/audio",
+        "include/audio/nodes",
+        "include/audio/android",
+    ],
+}
+
+cc_library_headers {
+    name: "libimsmedia_video_headers",
+    export_include_dirs: [
+        "include/video",
+        "include/video/nodes",
+        "include/video/android",
+    ],
+}
+
+cc_library_headers {
+    name: "libimsmedia_text_headers",
+    export_include_dirs: [
+        "include/text",
+        "include/text/nodes",
+    ],
+}
+
+cc_library_headers {
+    name: "libimsmedia_core_interface_headers",
+    export_include_dirs: [
+        "interface/utils",
+    ],
+}
+
+cc_defaults {
+    name: "libimsmedia_shared_defaults",
+    cflags: [
+    ],
+    header_libs: [
+    ],
+    include_dirs: [
+        "frameworks/native/include",
+        "frameworks/native/libs/binder/include/binder",
+        "frameworks/av/media",
+    ],
+}
+
+cc_defaults {
+    name: "libimsmedia_audio_defaults",
+    cflags: [
+    ],
+    header_libs: [
+        "libimsmedia_headers",
+        "libimsmedia_audio_headers",
+        "libimsmedia_config_headers",
+    ],
+}
+
+cc_defaults {
+    name: "libimsmedia_video_defaults",
+    cflags: [
+    ],
+    header_libs: [
+        "libimsmedia_headers",
+        "libimsmedia_video_headers",
+        "libimsmedia_config_headers",
+    ],
+    shared_libs: [
+        "libnativewindow",
+        "libcamera2ndk",
+        "libandroid"
+    ],
+    include_dirs: [
+        "frameworks/av/camera/ndk/include",
+        "frameworks/av/include",
+    ],
+}
+
+cc_defaults {
+    name: "libimsmedia_text_defaults",
+    cflags: [
+    ],
+    header_libs: [
+        "libimsmedia_headers",
+        "libimsmedia_text_headers",
+        "libimsmedia_config_headers",
+    ],
+}
+
+cc_library_static {
+    name: "libimsmedia_core",
+    defaults: [
+        "libimsmedia_protocol_defaults",
+        "libimsmedia_shared_defaults",
+        "libimsmedia_audio_defaults",
+        "libimsmedia_video_defaults",
+        "libimsmedia_text_defaults",
+    ],
+    srcs: [
+        "**/*.cpp",
+        ":libimsmedia_jni_srcs"
+    ],
+    local_include_dirs: [
+        "include",
+    ],
+    header_libs: [
+        "libimsmedia_jni_headers",
+        "libimsmedia_protocol_interface_headers",
+    ],
+    static_libs: [
+        "libimsmedia_config",
+        "libimsmedia_protocol",
+    ],
+    shared_libs: [
+        "framework-permission-aidl-cpp",
+        "libaaudio",
+        "libandroid_runtime",
+        "libbinder",
+        "libcutils",
+        "libjnigraphics",
+        "liblog",
+        "libmediandk",
+        "libutils",
+    ],
+}
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/BaseJitterBuffer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/BaseJitterBuffer.cpp
index d221e5b0..d221e5b0 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/BaseJitterBuffer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/BaseJitterBuffer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/BaseManager.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/BaseManager.cpp
index 551e1b82..551e1b82 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/BaseManager.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/BaseManager.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/BaseSession.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/BaseSession.cpp
index 4219c9c5..4219c9c5 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/BaseSession.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/BaseSession.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/BaseStreamGraph.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/BaseStreamGraph.cpp
index 6b40999b..6b40999b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/BaseStreamGraph.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/BaseStreamGraph.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/IRtpSession.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/IRtpSession.cpp
index 74f699dd..74f699dd 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/IRtpSession.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/IRtpSession.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/JitterNetworkAnalyser.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/JitterNetworkAnalyser.cpp
index 2d7e78c6..2d7e78c6 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/JitterNetworkAnalyser.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/JitterNetworkAnalyser.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/StreamScheduler.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/StreamScheduler.cpp
index 825e0589..825e0589 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/StreamScheduler.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/StreamScheduler.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioJitterBuffer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioJitterBuffer.cpp
index 3893e50c..3893e50c 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioJitterBuffer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioJitterBuffer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioManager.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioManager.cpp
index 0c440ac1..0c440ac1 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioManager.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioManager.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioSession.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioSession.cpp
index 040fd746..040fd746 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioSession.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioSession.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioStreamGraphRtcp.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtcp.cpp
index 7258c82e..7258c82e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioStreamGraphRtcp.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtcp.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioStreamGraphRtpRx.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpRx.cpp
index 798e96a8..798e96a8 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioStreamGraphRtpRx.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpRx.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioStreamGraphRtpTx.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpTx.cpp
index 8eba222a..8eba222a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/AudioStreamGraphRtpTx.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpTx.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/MediaQualityAnalyzer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/MediaQualityAnalyzer.cpp
index 2a8074f3..2a8074f3 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/MediaQualityAnalyzer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/MediaQualityAnalyzer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/RtcpXrEncoder.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/RtcpXrEncoder.cpp
index e8e3ddae..e8e3ddae 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/RtcpXrEncoder.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/RtcpXrEncoder.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/android/ImsMediaAudioPlayer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/ImsMediaAudioPlayer.cpp
index a36f8b53..a36f8b53 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/android/ImsMediaAudioPlayer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/ImsMediaAudioPlayer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/android/ImsMediaAudioSource.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/ImsMediaAudioSource.cpp
index 489a93ec..489a93ec 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/android/ImsMediaAudioSource.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/android/ImsMediaAudioSource.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadDecoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/AudioRtpPayloadDecoderNode.cpp
index 04fc5df1..04fc5df1 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadDecoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/AudioRtpPayloadDecoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadEncoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/AudioRtpPayloadEncoderNode.cpp
index 08f21484..08f21484 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadEncoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/AudioRtpPayloadEncoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/DtmfEncoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/DtmfEncoderNode.cpp
index bf2141d5..bf2141d5 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/DtmfEncoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/DtmfEncoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/DtmfSenderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/DtmfSenderNode.cpp
index 8090b944..8090b944 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/DtmfSenderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/DtmfSenderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioPlayerNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioPlayerNode.cpp
index 94a4723e..94a4723e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioPlayerNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioPlayerNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioSourceNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp
index 829a3321..829a3321 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioSourceNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/ImsMediaAudioUtil.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/ImsMediaAudioUtil.cpp
index 921f9059..921f9059 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/ImsMediaAudioUtil.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/ImsMediaAudioUtil.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseJitterBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseJitterBuffer.h
index 293b42eb..293b42eb 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseJitterBuffer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseJitterBuffer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseManager.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseManager.h
index e732cd11..e732cd11 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseManager.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseManager.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseSession.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseSession.h
index 4c27539a..4c27539a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseSession.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseSession.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseSessionCallback.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseSessionCallback.h
index 60617361..60617361 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseSessionCallback.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseSessionCallback.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseStreamGraph.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseStreamGraph.h
index 956f8631..956f8631 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/BaseStreamGraph.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseStreamGraph.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/IRtpSession.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/IRtpSession.h
index 70a6b690..70a6b690 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/IRtpSession.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/IRtpSession.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/ImsMediaDefine.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/ImsMediaDefine.h
index 9220c02e..9220c02e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/ImsMediaDefine.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/ImsMediaDefine.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/JitterNetworkAnalyser.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/JitterNetworkAnalyser.h
index ae234d82..ae234d82 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/JitterNetworkAnalyser.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/JitterNetworkAnalyser.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/StreamScheduler.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/StreamScheduler.h
index d59b942a..d59b942a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/StreamScheduler.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/StreamScheduler.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/StreamSchedulerCallback.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/StreamSchedulerCallback.h
index d9a475ea..d9a475ea 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/StreamSchedulerCallback.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/StreamSchedulerCallback.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioJitterBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioJitterBuffer.h
index e3326706..e3326706 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioJitterBuffer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioJitterBuffer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioManager.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioManager.h
index a7b69c63..a7b69c63 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioManager.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioManager.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioSession.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioSession.h
index f67215bc..f67215bc 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioSession.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioSession.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioStreamGraph.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraph.h
index e7852791..e7852791 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioStreamGraph.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraph.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioStreamGraphRtcp.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtcp.h
index 4c9aac1b..4c9aac1b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioStreamGraphRtcp.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtcp.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioStreamGraphRtpRx.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtpRx.h
index ae48f75b..ae48f75b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioStreamGraphRtpRx.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtpRx.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioStreamGraphRtpTx.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtpTx.h
index 5853de91..5853de91 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/AudioStreamGraphRtpTx.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtpTx.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/ImsMediaAudioUtil.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/ImsMediaAudioUtil.h
index 4e64b33b..4e64b33b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/ImsMediaAudioUtil.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/ImsMediaAudioUtil.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/MediaQualityAnalyzer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/MediaQualityAnalyzer.h
index 9f056e1e..9f056e1e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/MediaQualityAnalyzer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/MediaQualityAnalyzer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/RtcpXrEncoder.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/RtcpXrEncoder.h
index f415a6d3..f415a6d3 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/RtcpXrEncoder.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/RtcpXrEncoder.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/android/IFrameCallback.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/android/IFrameCallback.h
index a24cde6e..a24cde6e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/android/IFrameCallback.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/android/IFrameCallback.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/android/ImsMediaAudioDefine.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/android/ImsMediaAudioDefine.h
index d7a1c596..d7a1c596 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/android/ImsMediaAudioDefine.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/android/ImsMediaAudioDefine.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/android/ImsMediaAudioPlayer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/android/ImsMediaAudioPlayer.h
index 74b8eb35..74b8eb35 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/android/ImsMediaAudioPlayer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/android/ImsMediaAudioPlayer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/android/ImsMediaAudioSource.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/android/ImsMediaAudioSource.h
index dc089133..dc089133 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/android/ImsMediaAudioSource.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/android/ImsMediaAudioSource.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadDecoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadDecoderNode.h
index 98665a2c..98665a2c 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadDecoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadDecoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadEncoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadEncoderNode.h
index 766f4d1b..766f4d1b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadEncoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadEncoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/DtmfEncoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/DtmfEncoderNode.h
index 913f190d..913f190d 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/DtmfEncoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/DtmfEncoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/DtmfSenderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/DtmfSenderNode.h
index 5551dd98..5551dd98 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/DtmfSenderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/DtmfSenderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/IAudioPlayerNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioPlayerNode.h
index 31d7cd0f..31d7cd0f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/IAudioPlayerNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioPlayerNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/IAudioSourceNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioSourceNode.h
index 4b05167e..4b05167e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/IAudioSourceNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioSourceNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/BaseNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/BaseNode.h
index b067d102..b067d102 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/BaseNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/BaseNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/JitterBufferControlNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/JitterBufferControlNode.h
index 39b11453..39b11453 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/JitterBufferControlNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/JitterBufferControlNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/RtcpDecoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/RtcpDecoderNode.h
index 49379682..49379682 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/RtcpDecoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/RtcpDecoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/RtcpEncoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/RtcpEncoderNode.h
index f9d27597..f9d27597 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/RtcpEncoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/RtcpEncoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/RtpDecoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/RtpDecoderNode.h
index cc43c918..cc43c918 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/RtpDecoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/RtpDecoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/RtpEncoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/RtpEncoderNode.h
index 602efce5..602efce5 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/RtpEncoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/RtpEncoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/SocketReaderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/SocketReaderNode.h
index bc70c524..bc70c524 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/SocketReaderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/SocketReaderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/SocketWriterNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/SocketWriterNode.h
index 594fa1ad..594fa1ad 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/nodes/SocketWriterNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/SocketWriterNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextJitterBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextJitterBuffer.h
index 8ea1795c..8ea1795c 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextJitterBuffer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextJitterBuffer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextManager.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextManager.h
index 66201daa..66201daa 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextManager.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextManager.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextSession.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextSession.h
index 25e05a67..25e05a67 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextSession.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextSession.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextStreamGraph.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextStreamGraph.h
index 36c3ff35..36c3ff35 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextStreamGraph.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextStreamGraph.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextStreamGraphRtcp.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextStreamGraphRtcp.h
index 9832f036..9832f036 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextStreamGraphRtcp.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextStreamGraphRtcp.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextStreamGraphRtpRx.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextStreamGraphRtpRx.h
index 0d6e6c60..0d6e6c60 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextStreamGraphRtpRx.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextStreamGraphRtpRx.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextStreamGraphRtpTx.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextStreamGraphRtpTx.h
index 0d00be20..0d00be20 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/TextStreamGraphRtpTx.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextStreamGraphRtpTx.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/nodes/TextRendererNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/nodes/TextRendererNode.h
index cadc5b6d..cadc5b6d 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/nodes/TextRendererNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/nodes/TextRendererNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/nodes/TextRtpPayloadDecoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/nodes/TextRtpPayloadDecoderNode.h
index 13b881a3..13b881a3 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/nodes/TextRtpPayloadDecoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/nodes/TextRtpPayloadDecoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/nodes/TextRtpPayloadEncoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/nodes/TextRtpPayloadEncoderNode.h
index 6813db0b..6813db0b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/nodes/TextRtpPayloadEncoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/nodes/TextRtpPayloadEncoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/nodes/TextSourceNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/nodes/TextSourceNode.h
index 0245f92b..0245f92b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/text/nodes/TextSourceNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/nodes/TextSourceNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/IImsMediaThread.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/IImsMediaThread.h
index 53602964..53602964 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/IImsMediaThread.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/IImsMediaThread.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ISocket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ISocket.h
index 71054158..71054158 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ISocket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ISocket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaBinaryFormat.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaBinaryFormat.h
index a59066d2..a59066d2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaBinaryFormat.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaBinaryFormat.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaBitReader.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaBitReader.h
index 93352d70..93352d70 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaBitReader.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaBitReader.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaBitWriter.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaBitWriter.h
index e4aa8ea9..e4aa8ea9 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaBitWriter.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaBitWriter.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaCondition.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaCondition.h
index cec47057..cec47057 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaCondition.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaCondition.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaDataQueue.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaDataQueue.h
index 97396cb8..97396cb8 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaDataQueue.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaDataQueue.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaEventHandler.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaEventHandler.h
index 4e5dc7f0..4e5dc7f0 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaEventHandler.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaEventHandler.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaImageRotate.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaImageRotate.h
index 1e541d7b..1e541d7b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaImageRotate.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaImageRotate.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaNetworkUtil.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaNetworkUtil.h
index 8cb59132..8cb59132 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaNetworkUtil.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaNetworkUtil.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaSocket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaSocket.h
index 47c329c0..47c329c0 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaSocket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaSocket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/ImsMediaVideoUtil.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/ImsMediaVideoUtil.h
index cd3bd2ad..cd3bd2ad 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/ImsMediaVideoUtil.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/ImsMediaVideoUtil.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoJitterBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoJitterBuffer.h
index 8bd27985..8bd27985 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoJitterBuffer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoJitterBuffer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoManager.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoManager.h
index 6095335c..6095335c 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoManager.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoManager.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoSession.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoSession.h
index 3a79f643..3a79f643 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoSession.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoSession.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoStreamGraph.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoStreamGraph.h
index c0b45770..c0b45770 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoStreamGraph.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoStreamGraph.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoStreamGraphRtcp.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoStreamGraphRtcp.h
index 2ef9a5b6..2ef9a5b6 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoStreamGraphRtcp.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoStreamGraphRtcp.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoStreamGraphRtpRx.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoStreamGraphRtpRx.h
index 8ead6601..8ead6601 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoStreamGraphRtpRx.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoStreamGraphRtpRx.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoStreamGraphRtpTx.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoStreamGraphRtpTx.h
index b60916bc..b60916bc 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/VideoStreamGraphRtpTx.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoStreamGraphRtpTx.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/android/ImsMediaCamera.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/android/ImsMediaCamera.h
index 5edb4bfd..5edb4bfd 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/android/ImsMediaCamera.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/android/ImsMediaCamera.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/android/ImsMediaPauseImageSource.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/android/ImsMediaPauseImageSource.h
index 723499b9..723499b9 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/android/ImsMediaPauseImageSource.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/android/ImsMediaPauseImageSource.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/android/ImsMediaVideoRenderer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/android/ImsMediaVideoRenderer.h
index 098a017c..098a017c 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/android/ImsMediaVideoRenderer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/android/ImsMediaVideoRenderer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/android/ImsMediaVideoSource.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/android/ImsMediaVideoSource.h
index 1d533ded..1d533ded 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/android/ImsMediaVideoSource.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/android/ImsMediaVideoSource.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/nodes/IVideoRendererNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/nodes/IVideoRendererNode.h
index 1dc3ac54..1dc3ac54 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/nodes/IVideoRendererNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/nodes/IVideoRendererNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/nodes/IVideoSourceNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/nodes/IVideoSourceNode.h
index 618063ab..618063ab 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/nodes/IVideoSourceNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/nodes/IVideoSourceNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/nodes/VideoRtpPayloadDecoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/nodes/VideoRtpPayloadDecoderNode.h
index 13fc021d..13fc021d 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/nodes/VideoRtpPayloadDecoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/nodes/VideoRtpPayloadDecoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/nodes/VideoRtpPayloadEncoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/nodes/VideoRtpPayloadEncoderNode.h
index 2a368aa3..2a368aa3 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/video/nodes/VideoRtpPayloadEncoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/nodes/VideoRtpPayloadEncoderNode.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaTimer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/interface/utils/ImsMediaTimer.h
index 88ca0430..88ca0430 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaTimer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/interface/utils/ImsMediaTimer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaTrace.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/interface/utils/ImsMediaTrace.h
index 024d91b2..024d91b2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/utils/ImsMediaTrace.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/interface/utils/ImsMediaTrace.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/BaseNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/BaseNode.cpp
index 9cc4bccd..9cc4bccd 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/BaseNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/BaseNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/JitterBufferControlNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/JitterBufferControlNode.cpp
index f5b868c4..f5b868c4 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/JitterBufferControlNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/JitterBufferControlNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/RtcpDecoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/RtcpDecoderNode.cpp
index d88e5fa5..d88e5fa5 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/RtcpDecoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/RtcpDecoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/RtcpEncoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/RtcpEncoderNode.cpp
index cf7493f2..cf7493f2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/RtcpEncoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/RtcpEncoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/RtpDecoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/RtpDecoderNode.cpp
index 25f52969..25f52969 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/RtpDecoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/RtpDecoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/RtpEncoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/RtpEncoderNode.cpp
index 0d5295f7..0d5295f7 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/RtpEncoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/RtpEncoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/SocketReaderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/SocketReaderNode.cpp
index cbb1aa87..cbb1aa87 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/SocketReaderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/SocketReaderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/SocketWriterNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/SocketWriterNode.cpp
index 36cd96da..36cd96da 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/nodes/SocketWriterNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/nodes/SocketWriterNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextJitterBuffer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextJitterBuffer.cpp
index 9a5e9c47..9a5e9c47 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextJitterBuffer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextJitterBuffer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextManager.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextManager.cpp
index f4a72969..f4a72969 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextManager.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextManager.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextSession.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextSession.cpp
index 4f854708..4f854708 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextSession.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextSession.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextStreamGraphRtcp.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtcp.cpp
index c0b7066e..c0b7066e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextStreamGraphRtcp.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtcp.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextStreamGraphRtpRx.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpRx.cpp
index e386f2fd..e386f2fd 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextStreamGraphRtpRx.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpRx.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextStreamGraphRtpTx.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpTx.cpp
index 5e214c7b..5e214c7b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/TextStreamGraphRtpTx.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpTx.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/nodes/TextRendererNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRendererNode.cpp
index dc95cdc2..dc95cdc2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/nodes/TextRendererNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRendererNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/nodes/TextRtpPayloadDecoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRtpPayloadDecoderNode.cpp
index 176e79a4..176e79a4 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/nodes/TextRtpPayloadDecoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRtpPayloadDecoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/nodes/TextRtpPayloadEncoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRtpPayloadEncoderNode.cpp
index d1e00f35..d1e00f35 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/nodes/TextRtpPayloadEncoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRtpPayloadEncoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/nodes/TextSourceNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextSourceNode.cpp
index 086f4b8b..086f4b8b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/text/nodes/TextSourceNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextSourceNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/IImsMediaThread.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/IImsMediaThread.cpp
index 3e46a712..3e46a712 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/IImsMediaThread.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/IImsMediaThread.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ISocket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ISocket.cpp
index ee0d76a7..ee0d76a7 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ISocket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ISocket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaBinaryFormat.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaBinaryFormat.cpp
index be543a7c..be543a7c 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaBinaryFormat.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaBinaryFormat.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaBitReader.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaBitReader.cpp
index de1b6c30..de1b6c30 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaBitReader.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaBitReader.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaBitWriter.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaBitWriter.cpp
index 7bafc1c1..7bafc1c1 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaBitWriter.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaBitWriter.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaCondition.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaCondition.cpp
index 909290a6..909290a6 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaCondition.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaCondition.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaDataQueue.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaDataQueue.cpp
index 3f285008..3f285008 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaDataQueue.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaDataQueue.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaEventHandler.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaEventHandler.cpp
index 6252c1f8..6252c1f8 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaEventHandler.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaEventHandler.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaImageRotate.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaImageRotate.cpp
index 7ee053dc..7ee053dc 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaImageRotate.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaImageRotate.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaNetworkUtil.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaNetworkUtil.cpp
index 9e31e826..9e31e826 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaNetworkUtil.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaNetworkUtil.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaSocket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaSocket.cpp
index 2e23bd6b..2e23bd6b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaSocket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaSocket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaTimer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaTimer.cpp
index ea040b7b..ea040b7b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaTimer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaTimer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaTrace.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaTrace.cpp
index 9fd9286a..9fd9286a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/utils/ImsMediaTrace.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/utils/ImsMediaTrace.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/ImsMediaVideoUtil.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/ImsMediaVideoUtil.cpp
index 636364ed..636364ed 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/ImsMediaVideoUtil.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/ImsMediaVideoUtil.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoJitterBuffer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoJitterBuffer.cpp
index 37823bfa..37823bfa 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoJitterBuffer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoJitterBuffer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoManager.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoManager.cpp
index f48f0c49..f48f0c49 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoManager.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoManager.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoSession.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoSession.cpp
index 8d9e0e38..8d9e0e38 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoSession.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoSession.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoStreamGraphRtcp.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtcp.cpp
index 90927077..90927077 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoStreamGraphRtcp.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtcp.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoStreamGraphRtpRx.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpRx.cpp
index 610f637f..610f637f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoStreamGraphRtpRx.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpRx.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoStreamGraphRtpTx.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpTx.cpp
index 46209f71..46209f71 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/VideoStreamGraphRtpTx.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpTx.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/android/ImsMediaCamera.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/android/ImsMediaCamera.cpp
index eb2f41c0..eb2f41c0 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/android/ImsMediaCamera.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/android/ImsMediaCamera.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/android/ImsMediaPauseImageSource.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/android/ImsMediaPauseImageSource.cpp
index 99209c50..99209c50 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/android/ImsMediaPauseImageSource.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/android/ImsMediaPauseImageSource.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/android/ImsMediaVideoRenderer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/android/ImsMediaVideoRenderer.cpp
index 20b32c2f..20b32c2f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/android/ImsMediaVideoRenderer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/android/ImsMediaVideoRenderer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/android/ImsMediaVideoSource.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/android/ImsMediaVideoSource.cpp
index 061a86bf..061a86bf 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/android/ImsMediaVideoSource.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/android/ImsMediaVideoSource.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/nodes/IVideoRendererNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoRendererNode.cpp
index f67a020f..f67a020f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/nodes/IVideoRendererNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoRendererNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/nodes/IVideoSourceNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp
index ec939f52..ec939f52 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/nodes/IVideoSourceNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/nodes/VideoRtpPayloadDecoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/VideoRtpPayloadDecoderNode.cpp
index ce93bc97..ce93bc97 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/nodes/VideoRtpPayloadDecoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/VideoRtpPayloadDecoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/nodes/VideoRtpPayloadEncoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/VideoRtpPayloadEncoderNode.cpp
index 36e0c8c9..36e0c8c9 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/video/nodes/VideoRtpPayloadEncoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/VideoRtpPayloadEncoderNode.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/Android.bp
new file mode 100644
index 00000000..bc1d5c77
--- /dev/null
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/Android.bp
@@ -0,0 +1,27 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// 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.
+
+filegroup {
+    name: "libimsmedia_jni_srcs",
+    srcs: [
+        "**/*.cpp",
+    ],
+}
+
+cc_library_headers {
+    name: "libimsmedia_jni_headers",
+    export_include_dirs: [
+        "include",
+    ],
+}
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/MediaManagerFactory.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/include/MediaManagerFactory.h
index fdcb33b0..fdcb33b0 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/MediaManagerFactory.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/include/MediaManagerFactory.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/libimsmediajni.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/libimsmediajni.cpp
index a5e79c6e..8f20ed78 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/libimsmediajni.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/jni/libimsmediajni.cpp
@@ -37,8 +37,6 @@ static jclass gClass_JNIImsMediaService = NULL;
 static jmethodID gMethod_sendData2Java = NULL;
 AAssetManager* gpAssetManager = NULL;
 
-jint ImsMediaServiceJni_OnLoad(JNIEnv* env);
-
 JavaVM* GetJavaVM()
 {
     return gJVM;
@@ -60,30 +58,6 @@ JNIEnv* GetJNIEnv()
     return env;
 }
 
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
-    (void)reserved;
-    ALOGD("JNI_OnLoad::JNI_OnLoad");
-    gJVM = vm;
-    JNIEnv* env = NULL;
-
-    if (vm->GetEnv((void**)&env, IMS_MEDIA_JNI_VERSION) != JNI_OK)
-    {
-        ALOGE("JNI_OnLoad::GetEnv failed");
-        return (-1);
-    }
-
-    assert(env != NULL);
-
-    if (ImsMediaServiceJni_OnLoad(env) < 0)
-    {
-        ALOGE("JNI_OnLoad::ImsMediaServiceJni_OnLoad failed");
-        return (-1);
-    }
-
-    return IMS_MEDIA_JNI_VERSION;
-}
-
 static int SendData2Java(long nNativeObject, const android::Parcel& objParcel)
 {
     JNIEnv* env;
@@ -222,8 +196,10 @@ static JNINativeMethod gMethods[] = {
         {"setLogMode", "(II)V", (void*)JNIImsMediaService_setLogMode},
 };
 
-jint ImsMediaServiceJni_OnLoad(JNIEnv* env)
+jint ImsMediaServiceJni_OnLoad(JavaVM* vm, JNIEnv* env)
 {
+    gJVM = vm;
+
     jclass _jclassImsMediaService = env->FindClass(gClassPath);
 
     if (_jclassImsMediaService == NULL)
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/libimsmedia.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/libimsmedia.cpp
new file mode 100644
index 00000000..3851137d
--- /dev/null
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/libimsmedia.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * 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.
+ */
+
+#define LOG_TAG "libimsmediajni"
+
+#include <stdio.h>
+#include <assert.h>
+#include <utils/Log.h>
+#include <nativehelper/JNIHelp.h>
+
+#define IMS_MEDIA_JNI_VERSION JNI_VERSION_1_4
+
+extern jint ImsMediaServiceJni_OnLoad(JavaVM* vm, JNIEnv* env);
+
+jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+    (void)reserved;
+
+    ALOGD("JNI_OnLoad::JNI_OnLoad");
+
+    JNIEnv* env = NULL;
+
+    if (vm->GetEnv((void**)&env, IMS_MEDIA_JNI_VERSION) != JNI_OK)
+    {
+        ALOGE("JNI_OnLoad::GetEnv failed");
+        return (-1);
+    }
+
+    assert(env != NULL);
+
+    if (ImsMediaServiceJni_OnLoad(vm, env) < 0)
+    {
+        ALOGE("JNI_OnLoad::ImsMediaServiceJni_OnLoad failed");
+        return (-1);
+    }
+
+    return IMS_MEDIA_JNI_VERSION;
+}
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/Android.bp
new file mode 100644
index 00000000..1c756d14
--- /dev/null
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/Android.bp
@@ -0,0 +1,53 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// 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.
+
+cc_library_headers {
+    name: "libimsmedia_protocol_headers",
+    export_include_dirs: [
+        "include/rtp/core",
+        "include/rtp/utils",
+        "interface/rtp",
+    ],
+}
+
+cc_library_headers {
+    name: "libimsmedia_protocol_interface_headers",
+    export_include_dirs: [
+        "interface/rtp",
+    ],
+}
+
+cc_defaults {
+    name: "libimsmedia_protocol_defaults",
+    defaults: [
+    ],
+    cflags: [
+        "-DRTP_TRACE_ENABLE",
+        "-DRTP_DEBUG_ENABLE",
+    ],
+    header_libs: [
+        "libimsmedia_protocol_headers",
+        "libimsmedia_core_interface_headers",
+    ],
+}
+
+cc_library_static {
+    name: "libimsmedia_protocol",
+    defaults: [
+        "libimsmedia_protocol_defaults",
+    ],
+    srcs: [
+        "**/*.cpp",
+    ],
+}
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpAppPacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpAppPacket.h
index 12011134..12011134 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpAppPacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpAppPacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpByePacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpByePacket.h
index 00f6cabd..00f6cabd 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpByePacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpByePacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpChunk.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpChunk.h
index 7af1c1fa..7af1c1fa 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpChunk.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpChunk.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpConfigInfo.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpConfigInfo.h
index 1411551a..1411551a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpConfigInfo.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpConfigInfo.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpFbPacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpFbPacket.h
index 53e27a4f..53e27a4f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpFbPacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpFbPacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpHeader.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpHeader.h
index f0ddfd5e..f0ddfd5e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpHeader.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpHeader.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpPacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpPacket.h
index 9875b8f3..9875b8f3 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpPacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpPacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpReportBlock.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpReportBlock.h
index 086459e4..086459e4 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpReportBlock.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpReportBlock.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpRrPacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpRrPacket.h
index 11e94e03..11e94e03 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpRrPacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpRrPacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpSdesPacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpSdesPacket.h
index 575d40bf..575d40bf 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpSdesPacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpSdesPacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpSrPacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpSrPacket.h
index f082c06b..f082c06b 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpSrPacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpSrPacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpXrPacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpXrPacket.h
index e9b16b22..e9b16b22 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtcpXrPacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtcpXrPacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpHeader.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpHeader.h
index 5725d777..5725d777 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpHeader.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpHeader.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpPacket.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpPacket.h
index 869d16c9..869d16c9 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpPacket.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpPacket.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpPayloadInfo.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpPayloadInfo.h
index f49d4999..f49d4999 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpPayloadInfo.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpPayloadInfo.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpReceiverInfo.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpReceiverInfo.h
index 7af88e1a..7af88e1a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpReceiverInfo.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpReceiverInfo.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpSession.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpSession.h
index 7d53b5bd..7d53b5bd 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpSession.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpSession.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpSessionManager.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpSessionManager.h
index f60b2793..f60b2793 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpSessionManager.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpSessionManager.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpStack.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpStack.h
index 84cd88b1..84cd88b1 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpStack.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpStack.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpStackProfile.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpStackProfile.h
index ab23cb66..ab23cb66 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpStackProfile.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpStackProfile.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpStackUtil.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpStackUtil.h
index a3e74de2..a3e74de2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpStackUtil.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpStackUtil.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpTimerInfo.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpTimerInfo.h
index 83dee6f4..83dee6f4 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/core/RtpTimerInfo.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/core/RtpTimerInfo.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpBuffer.h
index bf615533..bf615533 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpBuffer.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpBuffer.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpError.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpError.h
index 458217c7..458217c7 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpError.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpError.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpGlobal.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpGlobal.h
index bdc6d0b2..bdc6d0b2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpGlobal.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpGlobal.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpOsUtil.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpOsUtil.h
index 26d6ff43..26d6ff43 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpOsUtil.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpOsUtil.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpPfDatatypes.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpPfDatatypes.h
index a85ba7ce..a85ba7ce 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpPfDatatypes.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpPfDatatypes.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpTrace.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpTrace.h
index 8d88ac11..8d88ac11 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/utils/RtpTrace.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/include/rtp/utils/RtpTrace.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/interface/IRtpAppInterface.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/interface/rtp/IRtpAppInterface.h
index 2f70529a..2f70529a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/include/interface/IRtpAppInterface.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/interface/rtp/IRtpAppInterface.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpImpl.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/interface/rtp/RtpImpl.h
index ec346eaa..ec346eaa 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpImpl.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/interface/rtp/RtpImpl.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpService.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/interface/rtp/RtpService.h
index ace81d67..ace81d67 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpService.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/interface/rtp/RtpService.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpServiceTypes.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/interface/rtp/RtpServiceTypes.h
index ea3796be..ea3796be 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpServiceTypes.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/interface/rtp/RtpServiceTypes.h
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpImpl.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/RtpImpl.cpp
index f30b2015..f30b2015 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpImpl.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/RtpImpl.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpService.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/RtpService.cpp
index 0a0127a2..0a0127a2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/RtpService.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/RtpService.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpAppPacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpAppPacket.cpp
index 70744f07..70744f07 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpAppPacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpAppPacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpByePacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpByePacket.cpp
index 7d2a8aa5..7d2a8aa5 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpByePacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpByePacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpChunk.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpChunk.cpp
index ec434310..ec434310 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpChunk.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpChunk.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpConfigInfo.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpConfigInfo.cpp
index 251f37c6..251f37c6 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpConfigInfo.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpConfigInfo.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpFbPacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpFbPacket.cpp
index 5d33708d..5d33708d 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpFbPacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpFbPacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpHeader.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpHeader.cpp
index 053b42ea..053b42ea 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpHeader.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpHeader.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpPacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpPacket.cpp
index 8069ba6e..8069ba6e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpPacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpPacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpReportBlock.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpReportBlock.cpp
index 1b5c680a..1b5c680a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpReportBlock.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpReportBlock.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpRrPacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpRrPacket.cpp
index ff6a9cc1..ff6a9cc1 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpRrPacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpRrPacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpSdesPacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSdesPacket.cpp
index 0cdf89da..0cdf89da 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpSdesPacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSdesPacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpSrPacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSrPacket.cpp
index 165d66f1..165d66f1 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpSrPacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSrPacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpXrPacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpXrPacket.cpp
index 46950ded..46950ded 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtcpXrPacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpXrPacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpHeader.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpHeader.cpp
index f0310a90..f0310a90 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpHeader.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpHeader.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpPacket.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacket.cpp
index a02dced2..a02dced2 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpPacket.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacket.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpPayloadInfo.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPayloadInfo.cpp
index f3816784..f3816784 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpPayloadInfo.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPayloadInfo.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpReceiverInfo.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpReceiverInfo.cpp
index b162a712..b162a712 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpReceiverInfo.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpReceiverInfo.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpSession.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpSession.cpp
index e4bf900e..e4bf900e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpSession.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpSession.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpSessionManager.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpSessionManager.cpp
index 71b3352e..71b3352e 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpSessionManager.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpSessionManager.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpStack.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStack.cpp
index af620cbd..af620cbd 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpStack.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStack.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpStackProfile.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackProfile.cpp
index 25ae2439..25ae2439 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpStackProfile.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackProfile.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpStackUtil.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackUtil.cpp
index edb60919..edb60919 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpStackUtil.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackUtil.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpTimerInfo.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpTimerInfo.cpp
index 6327d8f7..6327d8f7 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/core/RtpTimerInfo.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpTimerInfo.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/utils/RtpBuffer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/utils/RtpBuffer.cpp
index 76e4730f..76e4730f 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/utils/RtpBuffer.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/utils/RtpBuffer.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/utils/RtpOsUtil.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/utils/RtpOsUtil.cpp
index 8d1d62d0..8d1d62d0 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/src/utils/RtpOsUtil.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/utils/RtpOsUtil.cpp
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/Android.bp
deleted file mode 100644
index c4baa254..00000000
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_library_static {
-    name: "librtpservice",
-    defaults: [
-    ],
-    cflags: [
-        "-DRTP_TRACE_ENABLE",
-        "-DRTP_DEBUG_ENABLE",
-    ],
-    srcs: [
-        "RtpImpl.cpp",
-        "RtpService.cpp",
-    ],
-    header_libs: [
-        "librtp_headers",
-        "libimsmedia_utils_header",
-    ],
-}
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/Android.bp
deleted file mode 100644
index 395ebf15..00000000
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/rtpservice/rtpstack/Android.bp
+++ /dev/null
@@ -1,36 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_library_headers {
-    name: "librtp_headers",
-    export_include_dirs: [
-        "include/core",
-        "include/interface",
-        "include/utils",
-    ],
-}
-
-cc_defaults {
-    name: "librtp_defaults",
-    defaults: [
-    ],
-    cflags: [
-        "-DRTP_TRACE_ENABLE",
-        "-DRTP_DEBUG_ENABLE",
-    ],
-    header_libs: [
-        "librtp_headers",
-        "libimsmedia_utils_header",
-    ],
-}
-
-cc_library_static {
-    name: "librtpprotocol",
-    defaults: [
-        "librtp_defaults",
-    ],
-    srcs: [
-        "src/**/*.cpp",
-    ],
-}
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/Android.bp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/Android.bp
deleted file mode 100644
index 2db9c3eb..00000000
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/Android.bp
+++ /dev/null
@@ -1,30 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_library_headers {
-    name: "libimsmedia_config_headers",
-    export_include_dirs: [
-        "include",
-    ],
-}
-
-cc_defaults {
-    name: "libimsmedia_config_defaults",
-    header_libs: [
-        "libimsmedia_config_headers",
-    ],
-    srcs: [
-        "**/*.cpp",
-    ],
-}
-
-cc_library {
-    name: "libimsmedia_config",
-    defaults: ["libimsmedia_config_defaults"],
-    shared_libs: [
-        "libbinder",
-        "libutils",
-        "liblog",
-    ],
-}