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

Commit b2ae164e authored by Haofan Wang's avatar Haofan Wang Committed by Android (Google) Code Review
Browse files

Merge "Rename setCallback to setAmbientBacklightCallback" into main

parents c0b231c9 86c3fadc

tv/mediaquality/aidl/aidl_api/android.hardware.tv.mediaquality/current/android/hardware/tv/mediaquality/IMediaQuality.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.tv.mediaquality;

@VintfStability

interface IMediaQuality {

  void setCallback(in android.hardware.tv.mediaquality.IMediaQualityCallback callback);

  void setAmbientBacklightCallback(in android.hardware.tv.mediaquality.IMediaQualityCallback callback);

  void setAmbientBacklightDetector(in android.hardware.tv.mediaquality.AmbientBacklightSettings settings);

  void setAmbientBacklightDetectionEnabled(in boolean enabled);

  boolean getAmbientBacklightDetectionEnabled();

tv/mediaquality/aidl/android/hardware/tv/mediaquality/IMediaQuality.aidl

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ interface IMediaQuality { 
     *

     * @param callback Callback object to pass events.

     */

    void setCallback(in IMediaQualityCallback callback);

    void setAmbientBacklightCallback(in IMediaQualityCallback callback);



    /**

     * Sets the ambient backlight detector settings.

tv/mediaquality/aidl/default/hal/media_quality_hal_impl.rs

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ impl Interface for MediaQualityService {} 


impl IMediaQuality for MediaQualityService {



    fn setCallback(

    fn setAmbientBacklightCallback(

        &self,

        callback: &Strong<dyn IMediaQualityCallback>

    ) -> binder::Result<()> {

tv/mediaquality/aidl/vts/functional/VtsHalMediaQualityTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ TEST_P(MediaQualityAidl, TestSetAmbientBacklightDetectionEnabled) { 
                open_cb_promise.set_value();

                return ScopedAStatus::ok();

            });

    ASSERT_OK(mediaquality->setCallback(callback));

    ASSERT_OK(mediaquality->setAmbientBacklightCallback(callback));

    ASSERT_OK(mediaquality->setAmbientBacklightDetectionEnabled(true));

    std::chrono::milliseconds timeout{10000};

    EXPECT_EQ(open_cb_future.wait_for(timeout), std::future_status::ready);
@@ -161,7 +161,7 @@ TEST_P(MediaQualityAidl, TestGetAmbientBacklightDetectionEnabled) { 
TEST_P(MediaQualityAidl, TestSetMediaQualityCallback) {

    std::shared_ptr<MediaQualityCallback> callback = ndk::SharedRefBase::make<MediaQualityCallback>(

            [](auto /* event */) { return ScopedAStatus::ok(); });

    ASSERT_OK(mediaquality->setCallback(callback));

    ASSERT_OK(mediaquality->setAmbientBacklightCallback(callback));

}



TEST_P(MediaQualityAidl, TestSetPictureProfileAdjustmentListener) {