diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-04-10 17:09:03 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-04-10 17:20:33 -0700 |
| commit | 847be6a44c7bd1ea7ba5231033a0ca6bf13b0254 (patch) | |
| tree | 3534b931f1b3ebf06d34054114d17a7b33ea5c9a | |
| parent | 795430f7ab680a4dadd782df2bb3f0e1e26c5996 (diff) | |
| download | android_device_generic_goldfish-847be6a44c7bd1ea7ba5231033a0ca6bf13b0254.tar.gz android_device_generic_goldfish-847be6a44c7bd1ea7ba5231033a0ca6bf13b0254.tar.bz2 android_device_generic_goldfish-847be6a44c7bd1ea7ba5231033a0ca6bf13b0254.zip | |
Fix build: Remove LENS_POSITION from both HALv2 and HALv3
Change-Id: Iffde8b14d3937808ce367d60d34fa638cea13497
| -rw-r--r-- | camera/EmulatedFakeCamera2.cpp | 15 | ||||
| -rw-r--r-- | camera/EmulatedFakeCamera3.cpp | 15 |
2 files changed, 0 insertions, 30 deletions
diff --git a/camera/EmulatedFakeCamera2.cpp b/camera/EmulatedFakeCamera2.cpp index cbc67ed..79658f1 100644 --- a/camera/EmulatedFakeCamera2.cpp +++ b/camera/EmulatedFakeCamera2.cpp @@ -2104,21 +2104,6 @@ status_t EmulatedFakeCamera2::constructStaticInfo( ANDROID_LENS_FACING_BACK : ANDROID_LENS_FACING_FRONT; ADD_OR_SIZE(ANDROID_LENS_FACING, &lensFacing, 1); - float lensPosition[3]; - if (mFacingBack) { - // Back-facing camera is center-top on device - lensPosition[0] = 0; - lensPosition[1] = 20; - lensPosition[2] = -5; - } else { - // Front-facing camera is center-right on device - lensPosition[0] = 20; - lensPosition[1] = 20; - lensPosition[2] = 0; - } - ADD_OR_SIZE(ANDROID_LENS_POSITION, lensPosition, sizeof(lensPosition)/ - sizeof(float)); - // android.sensor ADD_OR_SIZE(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE, diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp index 8302da4..8821d90 100644 --- a/camera/EmulatedFakeCamera3.cpp +++ b/camera/EmulatedFakeCamera3.cpp @@ -1064,21 +1064,6 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { ANDROID_LENS_FACING_BACK : ANDROID_LENS_FACING_FRONT; info.update(ANDROID_LENS_FACING, &lensFacing, 1); - float lensPosition[3]; - if (mFacingBack) { - // Back-facing camera is center-top on device - lensPosition[0] = 0; - lensPosition[1] = 20; - lensPosition[2] = -5; - } else { - // Front-facing camera is center-right on device - lensPosition[0] = 20; - lensPosition[1] = 20; - lensPosition[2] = 0; - } - info.update(ANDROID_LENS_POSITION, lensPosition, sizeof(lensPosition)/ - sizeof(float)); - // android.sensor info.update(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE, |