Merge "audio policy: use factory to create audio policy manager" (eb4b03cb) · Commits · e / os / android_frameworks_av

CleanSpec.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicy
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicy.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicyservice_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicymanager_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicyservice.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicymanager.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicyservice_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicymanager_intermediates)

		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

+15 −1

Original line number	Diff line number	Diff line
		@@ -46,8 +46,8 @@ LOCAL_CFLAGS += -fvisibility=hidden

		include $(BUILD_SHARED_LIBRARY)


		ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)
		ifneq ($(USE_CUSTOM_AUDIO_POLICY), 1)

		include $(CLEAR_VARS)

		@@ -62,6 +62,20 @@ LOCAL_SHARED_LIBRARIES := \
		LOCAL_STATIC_LIBRARIES := \
		libmedia_helper

		LOCAL_MODULE:= libaudiopolicymanagerdefault

		include $(BUILD_SHARED_LIBRARY)

		ifneq ($(USE_CUSTOM_AUDIO_POLICY), 1)

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		AudioPolicyFactory.cpp

		LOCAL_SHARED_LIBRARIES := \
		libaudiopolicymanagerdefault

		LOCAL_MODULE:= libaudiopolicymanager

		include $(BUILD_SHARED_LIBRARY)

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.
		*/

		#include "AudioPolicyManager.h"

		namespace android {

		extern "C" AudioPolicyInterface* createAudioPolicyManager(
		AudioPolicyClientInterface *clientInterface)
		{
		return new AudioPolicyManager(clientInterface);
		}

		extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface)
		{
		delete interface;
		}

		}; // namespace android

+2 −2

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ AudioPolicyService::AudioPolicyService()
		ALOGI("AudioPolicyService CSTOR in new mode");

		mAudioPolicyClient = new AudioPolicyClient(this);
		mAudioPolicyManager = new AudioPolicyManager(mAudioPolicyClient);
		mAudioPolicyManager = createAudioPolicyManager(mAudioPolicyClient);
		#endif

		// load audio pre processing modules
		@@ -145,7 +145,7 @@ AudioPolicyService::~AudioPolicyService()
		audio_policy_dev_close(mpAudioPolicyDev);
		}
		#else
		delete mAudioPolicyManager;
		destroyAudioPolicyManager(mAudioPolicyManager);
		delete mAudioPolicyClient;
		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -539,7 +539,7 @@ private:
		sp<AudioCommandThread> mOutputCommandThread; // process stop and release output
		struct audio_policy_device *mpAudioPolicyDev;
		struct audio_policy *mpAudioPolicy;
		AudioPolicyManager *mAudioPolicyManager;
		AudioPolicyInterface *mAudioPolicyManager;
		AudioPolicyClient *mAudioPolicyClient;

		KeyedVector< audio_source_t, InputSourceDesc* > mInputSources;