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

Commit df2e907e authored by Ytai Ben-tsvi's avatar Ytai Ben-tsvi Committed by Android (Google) Code Review
Browse files

Merge changes from topic "aidlize-audioflinger" 

* changes:
  Remove manual parceling from Interpolator and VolumeShaper
  Add av-types-aidl to libandroid_runtime, libmedia_jni
  Add dependencies to libandroid_runtime, libmedia_jni
  Add dependency to libandroid_runtime
parents 731d5e0d c3cd3cda

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",
@@ -615,6 +616,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.

core/jni/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ cc_library_shared { 
            ],



            shared_libs: [

                "audioclient-types-aidl-unstable-cpp",

                "audioflinger-aidl-unstable-cpp",

                "av-types-aidl-unstable-cpp",

                "libandroidicu",

                "libbpf_android",

                "libnetdbpf",

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));

            }

        }

    }