commit 8cfe8f7b0d7d2e7f71714fb4a400d828b445ff06
author Shuzhen Wang <shuzhenwang@google.com> Tue Jul 09 19:55:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 09 19:55:00 2019 -0700
tree 21152e80436d0d76d622f245dcdc80b72ec4fcbe
parent 25a6639d872889475b005b029b59ad0b237218f4
parent 1a4916e1ae1865aa137caba8db9e2966f6e504cf

Merge "Camera: Filter out NIR cameras for camera1 API" into qt-r1-dev am: 1393a2838d
am: 1a4916e1ae

Change-Id: I07c8aae1092a577882266e4147f6f0326693b95e

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 4201af3..c72029f 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -2065,6 +2065,13 @@
     return OK;
 }
 bool CameraProviderManager::ProviderInfo::DeviceInfo3::isAPI1Compatible() const {
+    // Do not advertise NIR cameras to API1 camera app.
+    camera_metadata_ro_entry cfa = mCameraCharacteristics.find(
+            ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT);
+    if (cfa.count == 1 && cfa.data.u8[0] == ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR) {
+        return false;
+    }
+
     bool isBackwardCompatible = false;
     camera_metadata_ro_entry_t caps = mCameraCharacteristics.find(
             ANDROID_REQUEST_AVAILABLE_CAPABILITIES);