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

Commit fa8a6da0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix a data type of the display ID"

parents 19b40054 13d1d106

automotive/evs/aidl/aidl_api/android.hardware.automotive.evs/current/android/hardware/automotive/evs/IEvsEnumerator.aidl

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ interface IEvsEnumerator { 
  android.hardware.automotive.evs.UltrasonicsArrayDesc[] getUltrasonicsArrayList();

  boolean isHardware();

  android.hardware.automotive.evs.IEvsCamera openCamera(in String cameraId, in android.hardware.automotive.evs.Stream streamCfg);

  android.hardware.automotive.evs.IEvsDisplay openDisplay(in byte id);

  android.hardware.automotive.evs.IEvsDisplay openDisplay(in int id);

  android.hardware.automotive.evs.IEvsUltrasonicsArray openUltrasonicsArray(in String ultrasonicsArrayId);

  void registerStatusCallback(in android.hardware.automotive.evs.IEvsEnumeratorStatusCallback callback);

}

automotive/evs/aidl/android/hardware/automotive/evs/IEvsEnumerator.aidl

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ interface IEvsEnumerator { 
     * @return EvsDisplay object to be used.

     * @throws EvsResult::INVALID_ARG if no display with a given id exists

     */

    IEvsDisplay openDisplay(in byte id);

    IEvsDisplay openDisplay(in int id);



    /**

     * Gets the IEvsUltrasonicsArray associated with a ultrasonicsArrayId from a

automotive/evs/aidl/impl/default/include/DefaultEvsEnumerator.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class DefaultEvsEnumerator final 
            const ::aidl::android::hardware::automotive::evs::CameraDesc& desc,

            std::vector<::aidl::android::hardware::automotive::evs::Stream>* _aidl_return) override;

    ::ndk::ScopedAStatus openDisplay(

            int8_t displayId,

            int32_t displayId,

            std::shared_ptr<::aidl::android::hardware::automotive::evs::IEvsDisplay>* obj) override;

    ::ndk::ScopedAStatus closeDisplay(

            const std::shared_ptr<::aidl::android::hardware::automotive::evs::IEvsDisplay>& obj)

automotive/evs/aidl/impl/default/src/DefaultEvsEnumerator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ ScopedAStatus DefaultEvsEnumerator::getStreamList(const CameraDesc& desc, 
    return ScopedAStatus::ok();

}



ScopedAStatus DefaultEvsEnumerator::openDisplay(int8_t displayId,

ScopedAStatus DefaultEvsEnumerator::openDisplay(int32_t displayId,

                                                std::shared_ptr<IEvsDisplay>* obj) {

    return ScopedAStatus::ok();

}