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

Commit e8d6e938 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4557233 from a737427b to pi-release 

Change-Id: Ic7c23715b1dde0c3950cb8f8e5b110a7b2885537
parents 85d5681b a737427b

audio/2.0/default/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.audio@2.0 \

    android.hardware.audio.common@2.0 \

    android.hardware.audio.effect@2.0 \

    android.hardware.soundtrigger@2.0 \

    android.hardware.soundtrigger@2.1 \

    android.hardware.broadcastradio@1.0 \

    android.hardware.broadcastradio@1.1

audio/2.0/default/service.cpp

+4 −4
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


#define LOG_TAG "audiohalservice"



#include <hidl/HidlTransportSupport.h>

#include <hidl/LegacySupport.h>

#include <android/hardware/audio/2.0/IDevicesFactory.h>

#include <android/hardware/audio/effect/2.0/IEffectsFactory.h>

#include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h>

#include <hidl/HidlTransportSupport.h>

#include <hidl/LegacySupport.h>



using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;
@@ -28,7 +28,7 @@ using android::hardware::registerPassthroughServiceImplementation; 


using android::hardware::audio::effect::V2_0::IEffectsFactory;

using android::hardware::audio::V2_0::IDevicesFactory;

using android::hardware::soundtrigger::V2_0::ISoundTriggerHw;

using android::hardware::soundtrigger::V2_1::ISoundTriggerHw;

using android::hardware::registerPassthroughServiceImplementation;



using android::OK;

automotive/vehicle/2.0/IVehicle.hal

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ interface IVehicle { 
   * For VehiclePropertyChangeMode::ON_CHANGE properties, it must return the

   * latest available value.

   *

   * Some properties like AUDIO_VOLUME requires to pass additional data in

   * Some properties like RADIO_PRESET requires to pass additional data in

   * GET request in VehiclePropValue object.

   *

   * If there is no data available yet, which can happen during initial stage,

broadcastradio/2.0/ITunerSession.hal

+2 −2
Original line number Diff line number Diff line
@@ -113,12 +113,12 @@ interface ITunerSession { 
     *                NOT_SUPPORTED if the flag is not supported at all.

     * @return value The current value of the flag, if result is OK.

     */

    getConfigFlag(ConfigFlag flag) generates (Result result, bool value);

    isConfigFlagSet(ConfigFlag flag) generates (Result result, bool value);



    /**

     * Sets the config flag.

     *

     * The success/failure result must be consistent with getConfigFlag.

     * The success/failure result must be consistent with isConfigFlagSet.

     *

     * @param flag Flag to set.

     * @param value The new value of a given flag.

broadcastradio/2.0/default/BroadcastRadio.cpp

+6 −1
Original line number Diff line number Diff line
@@ -112,6 +112,12 @@ Return<void> BroadcastRadio::getDabRegionConfig(getDabRegionConfig_cb _hidl_cb) 
Return<void> BroadcastRadio::openSession(const sp<ITunerCallback>& callback,

                                         openSession_cb _hidl_cb) {

    ALOGV("%s", __func__);



    /* For the needs of default implementation it's fine to instantiate new session object

     * out of the lock scope. If your implementation needs it, use reentrant lock.

     */

    sp<TunerSession> newSession = new TunerSession(*this, callback);



    lock_guard<mutex> lk(mMut);



    auto oldSession = mSession.promote();
@@ -121,7 +127,6 @@ Return<void> BroadcastRadio::openSession(const sp<ITunerCallback>& callback, 
        mSession = nullptr;

    }



    sp<TunerSession> newSession = new TunerSession(*this, callback);

    mSession = newSession;



    _hidl_cb(Result::OK, newSession);