Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3cd3cda authored Oct 30, 2020 by Ytai Ben-Tsvi

Remove manual parceling from Interpolator and VolumeShaper

Change-Id: Ic5c3bfeb67c6e1b9b2b3c6275ea4badbef8536d3

parent 203e4e66

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -580,6 +580,7 @@ java_defaults {
		aidl: {
		generate_get_transaction_name: true,
		local_include_dirs: ["media/aidl"],
		include_dirs: ["frameworks/av/aidl"],
		},
		dxflags: [
		"--core-library",
		@@ -614,6 +615,7 @@ java_defaults {
		// If MimeMap ever becomes its own APEX, then this dependency would need to be removed
		// in favor of an API stubs dependency in java_library "framework" below.
		"mimemap",
		"av-types-aidl-java",
		"mediatranscoding_aidl_interface-java",
		"soundtrigger_middleware-aidl-java",
		],

ApiDocs.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ stubs_defaults {
		// TODO(b/169090544): remove below aidl includes.
		aidl: {
		local_include_dirs: ["media/aidl"],
		include_dirs: ["frameworks/av/aidl"],
		},
		}

		@@ -157,6 +158,7 @@ doc_defaults {
		// TODO(b/169090544): remove below aidl includes.
		aidl: {
		local_include_dirs: ["media/aidl"],
		include_dirs: ["frameworks/av/aidl"],
		},
		}

StubLibraries.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ stubs_defaults {
		"telephony/java",
		"media/aidl",
		],
		include_dirs: ["frameworks/av/aidl"],
		},
		// These are libs from framework-internal-utils that are required (i.e. being referenced)
		// from framework-non-updatable-sources. Add more here when there's a need.

media/java/android/media/PlayerBase.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -520,11 +520,12 @@ public abstract class PlayerBase {

		@Override
		public void applyVolumeShaper(
		@NonNull VolumeShaper.Configuration configuration,
		@NonNull VolumeShaper.Operation operation) {
		@NonNull VolumeShaperConfiguration configuration,
		@NonNull VolumeShaperOperation operation) {
		final PlayerBase pb = mWeakPB.get();
		if (pb != null) {
		pb.playerApplyVolumeShaper(configuration, operation);
		pb.playerApplyVolumeShaper(VolumeShaper.Configuration.fromParcelable(configuration),
		VolumeShaper.Operation.fromParcelable(operation));
		}
		}
		}

media/java/android/media/PlayerProxy.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,8 @@ public class PlayerProxy {
		@NonNull VolumeShaper.Configuration configuration,
		@NonNull VolumeShaper.Operation operation) {
		try {
		mConf.getIPlayer().applyVolumeShaper(configuration, operation);
		mConf.getIPlayer().applyVolumeShaper(configuration.toParcelable(),
		operation.toParcelable());
		} catch (NullPointerException\|RemoteException e) {
		throw new IllegalStateException(
		"No player to proxy for applyVolumeShaper operation,"