resolve merge conflicts of a0c272439cbae8b232bd5e92e7d5241ae56354b2 to qt-qpr1-dev-plus-aosp (c91edfc6) · Commits · e / os / android_frameworks_av

media/libaudioclient/IAudioPolicyService.cpp

+16 −1

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@ enum {
		SET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,
		REMOVE_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,
		GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,
		AUDIO_MODULES_UPDATED, // oneway
		};

		#define MAX_ITEMS_PER_LIST 1024
		@@ -1336,6 +1337,13 @@ public:
		}
		return static_cast<status_t>(reply.readInt32());
		}

		virtual void onNewAudioModulesAvailable()
		{
		Parcel data, reply;
		data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
		remote()->transact(AUDIO_MODULES_UPDATED, data, &reply, IBinder::FLAG_ONEWAY);
		}
		};

		IMPLEMENT_META_INTERFACE(AudioPolicyService, "android.media.IAudioPolicyService");
		@@ -1402,7 +1410,8 @@ status_t BnAudioPolicyService::onTransact(
		case SET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
		case REMOVE_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
		case GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
		case SET_ALLOWED_CAPTURE_POLICY: {
		case SET_ALLOWED_CAPTURE_POLICY:
		case AUDIO_MODULES_UPDATED: {
		if (!isServiceUid(IPCThreadState::self()->getCallingUid())) {
		ALOGW("%s: transaction %d received from PID %d unauthorized UID %d",
		__func__, code, IPCThreadState::self()->getCallingPid(),
		@@ -2459,6 +2468,12 @@ status_t BnAudioPolicyService::onTransact(
		return NO_ERROR;
		}

		case AUDIO_MODULES_UPDATED: {
		CHECK_INTERFACE(IAudioPolicyService, data, reply);
		onNewAudioModulesAvailable();
		return NO_ERROR;
		} break;

		default:
		return BBinder::onTransact(code, data, reply, flags);
		}