summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-07-31 03:12:01 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-07-31 03:12:01 +0000
commit7776ff9836d5059168402e6a62b065a99972a649 (patch)
tree70ea7fef789720320b9f4384675f85ac58cb5847
parent50b4af6ee02c758df6cdb6d1b067125172c11116 (diff)
parent4a57dd62c87f3a3510d08e660bfcd63ec45997c1 (diff)
downloadandroid_device_generic_goldfish-7776ff9836d5059168402e6a62b065a99972a649.tar.gz
android_device_generic_goldfish-7776ff9836d5059168402e6a62b065a99972a649.tar.bz2
android_device_generic_goldfish-7776ff9836d5059168402e6a62b065a99972a649.zip
Snap for 4922203 from 4a57dd62c87f3a3510d08e660bfcd63ec45997c1 to pi-qpr1-release
Change-Id: I41c2a0783621da5dafe5d38af4414a10b5357886
-rw-r--r--camera/EmulatedCamera3.h1
-rw-r--r--camera/EmulatedFakeCamera3.cpp4
2 files changed, 5 insertions, 0 deletions
diff --git a/camera/EmulatedCamera3.h b/camera/EmulatedCamera3.h
index 9d2d7b2..02057e5 100644
--- a/camera/EmulatedCamera3.h
+++ b/camera/EmulatedCamera3.h
@@ -66,6 +66,7 @@ public:
YUV_REPROCESSING,
DEPTH_OUTPUT,
CONSTRAINED_HIGH_SPEED_VIDEO,
+ MOTION_TRACKING,
// Levels
FULL_LEVEL,
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index 4330c02..96c2350 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -1113,6 +1113,7 @@ status_t EmulatedFakeCamera3::getCameraCapabilities() {
// "RAW" causes several CTS failures: b/68723953, disable it so far.
// TODO: add "RAW" back when all failures are resolved.
//mCapabilities.add(RAW);
+ mCapabilities.add(MOTION_TRACKING);
}
// Add level-based caps
@@ -1877,6 +1878,9 @@ status_t EmulatedFakeCamera3::constructStaticInfo() {
case CONSTRAINED_HIGH_SPEED_VIDEO:
caps.add(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO);
break;
+ case MOTION_TRACKING:
+ caps.add(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING);
+ break;
default:
// Ignore LEVELs
break;