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

Commit 391140f7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11784291 from 1b38b20d to 24Q3-release

Change-Id: I61035aadab41db448692d6b8130004da3cfa8a37
parents 2399b15e 1b38b20d
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ cc_library {
    name: "libcodec2_aidl_client",

    defaults: [
        "aconfig_lib_cc_static_link.defaults",
        "libcodec2_hal_selection",
    ],

@@ -65,6 +66,7 @@ cc_library {
    ],

    defaults: [
        "aconfig_lib_cc_static_link.defaults",
        "libcodec2_hal_selection",
    ],

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ cc_library {
    ],

    static_libs: ["aconfig_mediacodec_flags_c_lib"],

    defaults: [
        "aconfig_lib_cc_static_link.defaults",
    ],
}

cc_library_static {
+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ cc_library_shared {
        "libcodec2_client",
    ],

    defaults: [
        "aconfig_lib_cc_static_link.defaults",
    ],

    sanitize: {
        cfi: true,
        misc_undefined: [
+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ cc_library {
    ],

    defaults: [
	"aconfig_lib_cc_static_link.defaults",
        "libcodec2_hal_selection",
    ],

+4 −2
Original line number Diff line number Diff line
@@ -383,10 +383,12 @@ status_t StreamHalAidl::resume(StreamDescriptor::Reply* reply) {
                return INVALID_OPERATION;
            }
            return OK;
        } else if (state == StreamDescriptor::State::PAUSED) {
        } else if (state == StreamDescriptor::State::PAUSED ||
                   state == StreamDescriptor::State::TRANSFER_PAUSED ||
                   state == StreamDescriptor::State::DRAIN_PAUSED) {
            return sendCommand(makeHalCommand<HalCommand::Tag::start>(), reply);
        } else {
            ALOGE("%s: unexpected stream state: %s (expected IDLE or PAUSED)",
            ALOGE("%s: unexpected stream state: %s (expected IDLE or one of *PAUSED states)",
                        __func__, toString(state).c_str());
            return INVALID_OPERATION;
        }
Loading