Rename AudioPort and PolicyAudioPort accordingly.

Make the file name consistent as the class name.

Test: make
Bug: 135621476
Change-Id: Icbde26fe1798e344c3746f4678db098688456654

media/libaudiofoundation/Android.bp

@@ -10,7 +10,7 @@ cc_library_shared {
 
     srcs: [
         "AudioGain.cpp",
-        "AudioPortBase.cpp",
+        "AudioPort.cpp",
         "AudioProfile.cpp",
     ],
 

media/libaudiofoundation/AudioPort.cpp

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_TAG "AudioPortBase"
+#define LOG_TAG "AudioPort"
 
 #include <algorithm>
 
 #include <android-base/stringprintf.h>
-#include <media/AudioPortBase.h>
+#include <media/AudioPort.h>
 #include <utils/Log.h>
 
 namespace android {
@@ -188,4 +188,4 @@ bool AudioPortConfig::hasGainController(bool canUseForVolume) const
                            : audioport->getGains().size() > 0;
 }
 
-}
+}

services/audiopolicy/common/managerdefinitions/Android.bp

@@ -7,7 +7,6 @@ cc_library_static {
         "src/AudioOutputDescriptor.cpp",
         "src/AudioPatch.cpp",
         "src/AudioPolicyMix.cpp",
-        "src/AudioPort.cpp",
         "src/AudioProfileVectorHelper.cpp",
         "src/AudioRoute.cpp",
         "src/ClientDescriptor.cpp",
@@ -15,6 +14,7 @@ cc_library_static {
         "src/EffectDescriptor.cpp",
         "src/HwModule.cpp",
         "src/IOProfile.cpp",
+        "src/PolicyAudioPort.cpp",
         "src/Serializer.cpp",
         "src/SoundTriggerSession.cpp",
         "src/TypeConverter.cpp",

services/audiopolicy/common/managerdefinitions/include/AudioInputDescriptor.h

@@ -21,11 +21,11 @@
 #include <utils/SortedVector.h>
 #include <utils/KeyedVector.h>
 #include "AudioIODescriptorInterface.h"
-#include "AudioPort.h"
 #include "ClientDescriptor.h"
 #include "DeviceDescriptor.h"
 #include "EffectDescriptor.h"
 #include "IOProfile.h"
+#include "PolicyAudioPort.h"
 
 namespace android {
 

services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h

@@ -26,9 +26,9 @@
 #include <utils/KeyedVector.h>
 #include <system/audio.h>
 #include "AudioIODescriptorInterface.h"
-#include "AudioPort.h"
 #include "ClientDescriptor.h"
 #include "DeviceDescriptor.h"
+#include "PolicyAudioPort.h"
 #include <vector>
 
 namespace android {

services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h

@@ -19,11 +19,11 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include <AudioPort.h>
 #include <AudioPatch.h>
 #include <DeviceDescriptor.h>
 #include <IOProfile.h>
 #include <HwModule.h>
+#include <PolicyAudioPort.h>
 #include <AudioInputDescriptor.h>
 #include <AudioOutputDescriptor.h>
 #include <AudioPolicyMix.h>

services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "AudioPort.h"
+#include "PolicyAudioPort.h"
 #include <utils/Errors.h>
 #include <utils/String8.h>
 #include <utils/SortedVector.h>

services/audiopolicy/common/managerdefinitions/include/IOProfile.h

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "AudioPort.h"
 #include "DeviceDescriptor.h"
+#include "PolicyAudioPort.h"
 #include "policy.h"
 #include <utils/String8.h>
 #include <system/audio.h>

services/audiopolicy/common/managerdefinitions/include/PolicyAudioPort.h

@@ -20,7 +20,7 @@
 #include "AudioProfileVectorHelper.h"
 #include "HandleGenerator.h"
 #include <media/AudioGain.h>
-#include <media/AudioPortBase.h>
+#include <media/AudioPort.h>
 #include <utils/String8.h>
 #include <utils/Vector.h>
 #include <utils/RefBase.h>

services/audiopolicy/common/managerdefinitions/src/AudioCollections.cpp

@@ -18,9 +18,9 @@
 //#define LOG_NDEBUG 0
 
 #include "AudioCollections.h"
-#include "AudioPort.h"
 #include "AudioRoute.h"
 #include "HwModule.h"
+#include "PolicyAudioPort.h"
 
 namespace android {
 

services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp

@@ -20,7 +20,7 @@
 #include "AudioPolicyMix.h"
 #include "TypeConverter.h"
 #include "HwModule.h"
-#include "AudioPort.h"
+#include "PolicyAudioPort.h"
 #include "IOProfile.h"
 #include <AudioOutputDescriptor.h>
 

services/audiopolicy/common/managerdefinitions/src/AudioProfileVectorHelper.cpp

@@ -25,9 +25,9 @@
 #include <media/AudioResamplerPublic.h>
 #include <utils/Errors.h>
 
-#include "AudioPort.h"
 #include "AudioProfileVectorHelper.h"
 #include "HwModule.h"
+#include "PolicyAudioPort.h"
 #include "policy.h"
 
 namespace android {

services/audiopolicy/common/managerdefinitions/src/PolicyAudioPort.cpp

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "APM::AudioPort"
+#define LOG_TAG "APM::PolicyAudioPort"
 //#define LOG_NDEBUG 0
 #include "TypeConverter.h"
-#include "AudioPort.h"
+#include "PolicyAudioPort.h"
 #include "HwModule.h"
 #include <policy.h>
 

services/audiopolicy/engine/interface/AudioPolicyManagerObserver.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <AudioPort.h>
+#include <PolicyAudioPort.h>
 #include <AudioPatch.h>
 #include <IOProfile.h>
 #include <DeviceDescriptor.h>

services/audiopolicy/engineconfigurable/wrapper/include/ParameterManagerWrapper.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <AudioPort.h>
+#include <PolicyAudioPort.h>
 #include <HwModule.h>
 #include <DeviceDescriptor.h>
 #include <system/audio.h>

services/audiopolicy/enginedefault/src/Engine.cpp

@@ -27,7 +27,7 @@
 #include "Engine.h"
 #include <android-base/macros.h>
 #include <AudioPolicyManagerObserver.h>
-#include <AudioPort.h>
+#include <PolicyAudioPort.h>
 #include <IOProfile.h>
 #include <AudioIODescriptorInterface.h>
 #include <policy.h>

services/audiopolicy/managerdefault/AudioPolicyManager.h

@@ -37,7 +37,7 @@
 
 #include <AudioPolicyManagerObserver.h>
 #include <AudioPolicyConfig.h>
-#include <AudioPort.h>
+#include <PolicyAudioPort.h>
 #include <AudioPatch.h>
 #include <DeviceDescriptor.h>
 #include <IOProfile.h>