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

Commit dd3d0fc7 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "Camera NDK: Do not enable overrideToPortrait in ACameraManager" into... 

Merge "Camera NDK: Do not enable overrideToPortrait in ACameraManager" into tm-qpr-dev am: ab02c1a0 am: a3cab960

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/21098014



Change-Id: Ie4dffb9e71f023ed45d84d4e34400c36fdd8b40e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 358615af a3cab960

camera/ndk/impl/ACameraManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ camera_status_t ACameraManager::getCameraCharacteristics( 
    CameraMetadata rawMetadata;

    int targetSdkVersion = android_get_application_target_sdk_version();

    binder::Status serviceRet = cs->getCameraCharacteristics(String16(cameraIdStr),

            targetSdkVersion, /*overrideToPortrait*/true, &rawMetadata);

            targetSdkVersion, /*overrideToPortrait*/false, &rawMetadata);

    if (!serviceRet.isOk()) {

        switch(serviceRet.serviceSpecificErrorCode()) {

            case hardware::ICameraService::ERROR_DISCONNECTED:
@@ -747,7 +747,7 @@ ACameraManager::openCamera( 
    binder::Status serviceRet = cs->connectDevice(

            callbacks, String16(cameraId), String16(""), {},

            hardware::ICameraService::USE_CALLING_UID, /*oomScoreOffset*/0,

            targetSdkVersion, /*overrideToPortrait*/true, /*out*/&deviceRemote);

            targetSdkVersion, /*overrideToPortrait*/false, /*out*/&deviceRemote);



    if (!serviceRet.isOk()) {

        ALOGE("%s: connect camera device failed: %s", __FUNCTION__, serviceRet.toString8().string());