commit | e8e9e191502ce306a04221e10ea2fe06ee40cacb | [log] [tgz] |
---|---|---|
author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Mar 16 15:23:51 2017 -0700 |
committer | Yin-Chia Yeh <yinchiayeh@google.com> | Fri Mar 17 14:44:32 2017 -0700 |
tree | 68d436e9e51efc24598df0e8e5a0553afc8e369b | |
parent | 94c68e09c9a9f30a68ce46b5efb5795fccb34616 [diff] [blame] |
Camera: fix number of cameras logic Test: no Camera CTS regression Bug: 36289841 Change-Id: I7218347a0f2e8184dd43a9f35acc0554b761e15e
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.h b/services/camera/libcameraservice/common/CameraProviderManager.h index b1da831..04b9597 100644 --- a/services/camera/libcameraservice/common/CameraProviderManager.h +++ b/services/camera/libcameraservice/common/CameraProviderManager.h
@@ -292,6 +292,7 @@ static status_t setTorchMode(InterfaceT& interface, bool enabled); }; std::vector<std::unique_ptr<DeviceInfo>> mDevices; + int mUniqueDeviceCount; // HALv1-specific camera fields, including the actual device interface struct DeviceInfo1 : public DeviceInfo {