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

Commit ab02c1a0 authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

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

parents a81181a8 45ec7c2e

camera/ndk/impl/ACameraManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -696,7 +696,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:
@@ -748,7 +748,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());