summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-05-24 16:47:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-24 16:47:38 -0700
commit87ce3426077d16b6bd5b613bcacb209edfc35481 (patch)
treebb1cffbd52ddc871395ef8f35b7e0a0c87b9966f
parente58de6adc10487e85b4005bf560d2e183d7286ca (diff)
parent30717de92454be87aa55ac91d2b94a7872a0fcfb (diff)
downloaddevice_generic_goldfish-87ce3426077d16b6bd5b613bcacb209edfc35481.tar.gz
device_generic_goldfish-87ce3426077d16b6bd5b613bcacb209edfc35481.tar.bz2
device_generic_goldfish-87ce3426077d16b6bd5b613bcacb209edfc35481.zip
am 30717de9: camera3: Make front cameras limited mode, back cameras full mode
* commit '30717de92454be87aa55ac91d2b94a7872a0fcfb': camera3: Make front cameras limited mode, back cameras full mode
-rw-r--r--camera/EmulatedFakeCamera3.cpp14
-rw-r--r--camera/EmulatedFakeCamera3.h3
2 files changed, 17 insertions, 0 deletions
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index a321218a..ae4716cc 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -129,6 +129,12 @@ EmulatedFakeCamera3::EmulatedFakeCamera3(int cameraId, bool facingBack,
for (size_t i = 0; i < CAMERA3_TEMPLATE_COUNT; i++) {
mDefaultTemplates[i] = NULL;
}
+
+ /**
+ * Front cameras = limited mode
+ * Back cameras = full mode
+ */
+ mFullMode = facingBack;
}
EmulatedFakeCamera3::~EmulatedFakeCamera3() {
@@ -1323,6 +1329,14 @@ status_t EmulatedFakeCamera3::constructStaticInfo() {
info.update(ANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,
availableVstabModes, sizeof(availableVstabModes));
+ // android.info
+ const uint8_t supportedHardwareLevel =
+ mFullMode ? ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL :
+ ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;
+ info.update(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,
+ &supportedHardwareLevel,
+ /*count*/1);
+
mCameraInfo = info.release();
return OK;
diff --git a/camera/EmulatedFakeCamera3.h b/camera/EmulatedFakeCamera3.h
index e9ef1848..08898130 100644
--- a/camera/EmulatedFakeCamera3.h
+++ b/camera/EmulatedFakeCamera3.h
@@ -159,6 +159,9 @@ private:
/* Facing back (true) or front (false) switch. */
bool mFacingBack;
+ /* Full mode (true) or limited mode (false) switch */
+ bool mFullMode;
+
/**
* Cache for default templates. Once one is requested, the pointer must be
* valid at least until close() is called on the device