tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Camera: Try adding a passthrough legacy service" into oc-dr1-dev

Browse source 
am: efe973102a

Change-Id: Id9e41637c8afcf6d4a06fede7e023d41ee9126aa
This commit is contained in:
Emilian Peev 2017-06-30 18:05:43 +00:00 committed by android-build-merger
commit 3518e360ca
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View file

@ -100,6 +100,7 @@ using ::android::hardware::kSynchronizedReadWrite;
using ResultMetadataQueue = MessageQueue<uint8_t, kSynchronizedReadWrite>;
using ::android::hidl::manager::V1_0::IServiceManager;
const char kCameraPassthroughServiceName[] = "legacy/0";
const char *kProviderFQName = "android.hardware.camera.provider@2.4::ICameraProvider";
const uint32_t kMaxPreviewWidth = 1920;
const uint32_t kMaxPreviewHeight = 1080;
@ -257,6 +258,20 @@ void CameraHidlEnvironment::SetUp() {
}
});
std::string legacyName;
uint32_t legacyId;
ASSERT_TRUE(parseProviderName(kCameraPassthroughServiceName,
&legacyName /*out*/, &legacyId /*out*/));
auto legacyIt = mProviders.find(legacyName);
//Add any legacy passthrough implementations
if (legacyIt == mProviders.end()) {
sp<ICameraProvider> provider = ICameraProvider::tryGetService(
kCameraPassthroughServiceName);
if (nullptr != provider.get()) {
mProviders.emplace(legacyName, provider);
}
}
ASSERT_FALSE(mProviders.empty());
}