summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-05-08 11:39:53 -0700
committerEino-Ville Talvala <etalvala@google.com>2014-05-08 21:47:36 +0000
commit1caeb10a7a288d937195d925c52f441f454cbc9a (patch)
treeffbea57abe3aa02531b6e17e44f395c0f55456e4 /api/current.txt
parent825bfb4f7e9b87bf49a76d9fb43623da1df0df19 (diff)
downloadframeworks_base-1caeb10a7a288d937195d925c52f441f454cbc9a.zip
frameworks_base-1caeb10a7a288d937195d925c52f441f454cbc9a.tar.gz
frameworks_base-1caeb10a7a288d937195d925c52f441f454cbc9a.tar.bz2
DO NOT MERGE: Add android.hardware.camera.external feature.
This feature will be listed by Android devices that allow for an external camera to be connected to it. Such camera devices may not always be available or connected. Also clarify that android.hardware.camera.any also encompasses devices that list android.hardware.camera.external. Change-Id: I57497758877e4286c1f0116961731d483b56808f
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 40c09ab..8512043 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7300,6 +7300,7 @@ package android.content.pm {
field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera";
field public static final java.lang.String FEATURE_CAMERA_ANY = "android.hardware.camera.any";
field public static final java.lang.String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";
+ field public static final java.lang.String FEATURE_CAMERA_EXTERNAL = "android.hardware.camera.external";
field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";
field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";
field public static final java.lang.String FEATURE_CONSUMER_IR = "android.hardware.consumerir";