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

Commit 3d1c478f authored by Jim Kaye's avatar Jim Kaye Committed by Chien-Yu Chen
Browse files

Fix Emulator CTS tests for Camera, Location, Sensors, Telephony 

This gets all the android.app.cts.SystemFeaturesTest tests to pass.

In addition to these changes, the AVD's config.ini must indicate
an emulated front camera and no back camera.

https://code.google.com/p/android/issues/detail?id=205072

Bug: 28170202

Change-Id: I4588e7daeea034847912e9044c44edf629336c35
parent 6dcc706b

services/camera/libcameraservice/CameraFlashlight.cpp

+7 −3
Original line number Diff line number Diff line
@@ -888,9 +888,13 @@ status_t CameraHardwareInterfaceFlashControl::disconnectCameraDevice() { 
        return OK;

    }



    if (mParameters.get(CameraParameters::KEY_FLASH_MODE)) {

        // There is a flash, turn if off.

        // (If there isn't one, leave the parameter null)

        mParameters.set(CameraParameters::KEY_FLASH_MODE,

                CameraParameters::FLASH_MODE_OFF);

        mDevice->setParameters(mParameters);

    }

    mDevice->stopPreview();

    status_t res = native_window_api_disconnect(mSurface.get(),

            NATIVE_WINDOW_API_CAMERA);