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

Commit 7375a819 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add new feature combination query version" into main

parents 5beb1401 2b609afa

camera/camera_platform.aconfig

+6 −0
Original line number Diff line number Diff line
@@ -229,3 +229,9 @@ flag { 
    bug: "359944765"

}



flag {

    namespace: "camera_platform"

    name: "feature_combination_baklava"

    description: "Add new feature combination query version for Baklava"

    bug: "370778206"

}

services/camera/libcameraservice/common/CameraProviderManager.cpp

+16 −5
Original line number Diff line number Diff line
@@ -2058,14 +2058,25 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::addSessionConfigQuery 


    int versionCode = ANDROID_INFO_SESSION_CONFIGURATION_QUERY_VERSION_UPSIDE_DOWN_CAKE;

    IPCTransport ipcTransport = parentProvider->getIPCTransport();

    auto& c = mCameraCharacteristics;

    status_t res = OK;

    if (ipcTransport != IPCTransport::AIDL) {

        res = c.update(ANDROID_INFO_SESSION_CONFIGURATION_QUERY_VERSION, &versionCode, 1);

        mSessionConfigQueryVersion = versionCode;

        return res;

    }



    int deviceVersion = HARDWARE_DEVICE_API_VERSION(mVersion.get_major(), mVersion.get_minor());

    if (ipcTransport == IPCTransport::AIDL

            && deviceVersion >= CAMERA_DEVICE_API_VERSION_1_3) {

    if (deviceVersion == CAMERA_DEVICE_API_VERSION_1_3) {

        versionCode = ANDROID_INFO_SESSION_CONFIGURATION_QUERY_VERSION_VANILLA_ICE_CREAM;

    } else if (deviceVersion >= CAMERA_DEVICE_API_VERSION_1_4) {

        if (flags::feature_combination_baklava()) {

            versionCode = ANDROID_INFO_SESSION_CONFIGURATION_QUERY_VERSION_BAKLAVA;

        } else {

            versionCode = ANDROID_INFO_SESSION_CONFIGURATION_QUERY_VERSION_VANILLA_ICE_CREAM;

        }



    auto& c = mCameraCharacteristics;

    status_t res = c.update(ANDROID_INFO_SESSION_CONFIGURATION_QUERY_VERSION, &versionCode, 1);

    }

    res = c.update(ANDROID_INFO_SESSION_CONFIGURATION_QUERY_VERSION, &versionCode, 1);

    mSessionConfigQueryVersion = versionCode;

    return res;

}

services/camera/libcameraservice/common/CameraProviderManager.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ enum SystemCameraKind { 
#define CAMERA_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION(1, 0)

#define CAMERA_DEVICE_API_VERSION_1_2 HARDWARE_DEVICE_API_VERSION(1, 2)

#define CAMERA_DEVICE_API_VERSION_1_3 HARDWARE_DEVICE_API_VERSION(1, 3)

#define CAMERA_DEVICE_API_VERSION_1_4 HARDWARE_DEVICE_API_VERSION(1, 4)

#define CAMERA_DEVICE_API_VERSION_3_0 HARDWARE_DEVICE_API_VERSION(3, 0)

#define CAMERA_DEVICE_API_VERSION_3_1 HARDWARE_DEVICE_API_VERSION(3, 1)

#define CAMERA_DEVICE_API_VERSION_3_2 HARDWARE_DEVICE_API_VERSION(3, 2)