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

Commit 3c7d77fc authored by Eino-Ville Talvala (Eddy)'s avatar Eino-Ville Talvala (Eddy) Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add metrics for ultrawide-angle usage" into main

parents 3e865ddc 6f1a9c1b

camera/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ cc_library { 
    ],



    shared_libs: [

        "camera_platform_flags_c_lib",

        "libbase",

        "libcutils",

        "libutils",

camera/CameraSessionStats.cpp

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


// #define LOG_NDEBUG 0

#define LOG_TAG "CameraSessionStats"



#include <utils/Log.h>

#include <utils/String16.h>
@@ -414,6 +415,12 @@ status_t CameraSessionStats::readFromParcel(const android::Parcel* parcel) { 
        return err;

    }



    bool usedUltraWide = false;

    if ((err = parcel->readBool(&usedUltraWide)) != OK) {

        ALOGE("%s: Failed to read ultrawide usage from parcel", __FUNCTION__);

        return err;

    }



    int32_t sessionIdx;

    if ((err = parcel->readInt32(&sessionIdx)) != OK) {

        ALOGE("%s: Failed to read session index from parcel", __FUNCTION__);
@@ -443,6 +450,7 @@ status_t CameraSessionStats::readFromParcel(const android::Parcel* parcel) { 
    mStreamStats = std::move(streamStats);

    mUserTag = toStdString(userTag);

    mVideoStabilizationMode = videoStabilizationMode;

    mUsedUltraWide = usedUltraWide;

    mSessionIndex = sessionIdx;

    mCameraExtensionSessionStats = extStats;
@@ -541,6 +549,10 @@ status_t CameraSessionStats::writeToParcel(android::Parcel* parcel) const { 
        ALOGE("%s: Failed to write video stabilization mode!", __FUNCTION__);

        return err;

    }

    if ((err = parcel->writeBool(mUsedUltraWide)) != OK) {

        ALOGE("%s: Failed to write ultrawide usage!", __FUNCTION__);

        return err;

    }



    if ((err = parcel->writeInt32(mSessionIndex)) != OK) {

        ALOGE("%s: Failed to write session index!", __FUNCTION__);

camera/camera_platform.aconfig

+6 −6
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ package: "com.android.internal.camera.flags" 


flag {

     namespace: "camera_platform"

     name: "initial_test_flag"

     description: "Flag infrastructure test flag"

     bug: "292631208"

     name: "camera_hsum_permission"

     description: "Camera access by headless system user"

     bug: "273539631"

}



flag {

     namespace: "camera_platform"

     name: "camera_hsum_permission"

     description: "Camera access by headless system user"

     bug: "273539631"

     name: "log_ultrawide_usage"

     description: "Enable measuring how much usage there is for ultrawide-angle cameras"

     bug: "300515796"

}

camera/include/camera/CameraSessionStats.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ public: 
    std::vector<CameraStreamStats> mStreamStats;

    std::string mUserTag;

    int mVideoStabilizationMode;

    bool mUsedUltraWide;

    int mSessionIndex;



    CameraExtensionSessionStats mCameraExtensionSessionStats;

camera/tests/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ cc_defaults { 
        "libcamera_client",

    ],

    shared_libs: [

        "camera_platform_flags_c_lib",

        "libbase",

        "libcutils",

        "libutils",