Merge "CTA2075: Refactored the LCC API" into main (88ab7469) · Commits · e / os / android_frameworks_base

core/api/current.txt

+7 −6

Original line number	Diff line number	Diff line
		@@ -22153,16 +22153,17 @@ package android.media {
		method public void onJetUserIdUpdate(android.media.JetPlayer, int, int);
		}

		@FlaggedApi("android.media.audio.loudness_configurator_api") public class LoudnessCodecConfigurator {
		@FlaggedApi("android.media.audio.loudness_configurator_api") public class LoudnessCodecController implements java.lang.AutoCloseable {
		method @FlaggedApi("android.media.audio.loudness_configurator_api") public boolean addMediaCodec(@NonNull android.media.MediaCodec);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public static android.media.LoudnessCodecConfigurator create();
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public static android.media.LoudnessCodecConfigurator create(@NonNull java.util.concurrent.Executor, @NonNull android.media.LoudnessCodecConfigurator.OnLoudnessCodecUpdateListener);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public android.os.Bundle getLoudnessCodecParams(@NonNull android.media.AudioTrack, @NonNull android.media.MediaCodec);
		method public void close();
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public static android.media.LoudnessCodecController create(int);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public static android.media.LoudnessCodecController create(int, @NonNull java.util.concurrent.Executor, @NonNull android.media.LoudnessCodecController.OnLoudnessCodecUpdateListener);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public android.os.Bundle getLoudnessCodecParams(@NonNull android.media.MediaCodec);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") public void release();
		method @FlaggedApi("android.media.audio.loudness_configurator_api") public void removeMediaCodec(@NonNull android.media.MediaCodec);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") public void setAudioTrack(@Nullable android.media.AudioTrack);
		}

		@FlaggedApi("android.media.audio.loudness_configurator_api") public static interface LoudnessCodecConfigurator.OnLoudnessCodecUpdateListener {
		@FlaggedApi("android.media.audio.loudness_configurator_api") public static interface LoudnessCodecController.OnLoudnessCodecUpdateListener {
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public default android.os.Bundle onLoudnessCodecUpdate(@NonNull android.media.MediaCodec, @NonNull android.os.Bundle);
		}

media/java/android/media/IAudioService.aidl

+6 −5

Original line number	Diff line number	Diff line
		@@ -754,15 +754,16 @@ interface IAudioService {

		void unregisterLoudnessCodecUpdatesDispatcher(in ILoudnessCodecUpdatesDispatcher dispatcher);

		oneway void startLoudnessCodecUpdates(int piid, in List<LoudnessCodecInfo> codecInfoSet);
		oneway void startLoudnessCodecUpdates(int sessionId);

		oneway void stopLoudnessCodecUpdates(int piid);
		oneway void stopLoudnessCodecUpdates(int sessionId);

		oneway void addLoudnessCodecInfo(int piid, int mediaCodecHash, in LoudnessCodecInfo codecInfo);
		oneway void addLoudnessCodecInfo(int sessionId, int mediaCodecHash,
		in LoudnessCodecInfo codecInfo);

		oneway void removeLoudnessCodecInfo(int piid, in LoudnessCodecInfo codecInfo);
		oneway void removeLoudnessCodecInfo(int sessionId, in LoudnessCodecInfo codecInfo);

		PersistableBundle getLoudnessParams(int piid, in LoudnessCodecInfo codecInfo);
		PersistableBundle getLoudnessParams(in LoudnessCodecInfo codecInfo);

		@EnforcePermission("MODIFY_AUDIO_SETTINGS_PRIVILEGED")
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED)")

media/java/android/media/ILoudnessCodecUpdatesDispatcher.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.media;

		import android.media.AudioAttributes;
		import android.os.PersistableBundle;

		/**
		@@ -26,6 +27,6 @@ import android.os.PersistableBundle;
		*/
		oneway interface ILoudnessCodecUpdatesDispatcher {

		void dispatchLoudnessCodecParameterChange(int piid, in PersistableBundle params);
		void dispatchLoudnessCodecParameterChange(int sessionId, in PersistableBundle params);

		}
		No newline at end of file

media/java/android/media/LoudnessCodecConfigurator.java→media/java/android/media/LoudnessCodecController.java

+123 −157

File changed and moved.

Preview size limit exceeded, changes collapsed.

media/java/android/media/LoudnessCodecDispatcher.java

+27 −23

File changed.

Preview size limit exceeded, changes collapsed.