Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix a data type of the display ID"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-28 21:23:40 +00:00
committed by Android (Google) Code Review
parent 19b4005495 13d1d10666
commit fa8a6da095
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
automotive/evs/aidl/aidl_api/android.hardware.automotive.evs/current/android/hardware/automotive/evs/IEvsEnumerator.aidl
View File

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

2
automotive/evs/aidl/android/hardware/automotive/evs/IEvsEnumerator.aidl
View File

@@ -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

2
automotive/evs/aidl/impl/default/include/DefaultEvsEnumerator.h
View File

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

2
automotive/evs/aidl/impl/default/src/DefaultEvsEnumerator.cpp
View File

@@ -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();
}