diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-05-08 21:50:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 21:50:32 +0000 |
| commit | 0a7540c53af6671858beae268824f8c5240f944c (patch) | |
| tree | 0aad02bb5644216e32190d7c759d5b9a25e304ff /api | |
| parent | bbe22eb8d344bbff3fb1e058772a78b820f69f2e (diff) | |
| parent | 2e58d6de062fc48ad2a032d90d4956cf8041a894 (diff) | |
| download | frameworks_base-0a7540c53af6671858beae268824f8c5240f944c.zip frameworks_base-0a7540c53af6671858beae268824f8c5240f944c.tar.gz frameworks_base-0a7540c53af6671858beae268824f8c5240f944c.tar.bz2 | |
am 59969600: Merge "Add android.hardware.camera.external feature."
* commit '599696000400582773dcff7b6142b603ef68ec6b':
Add android.hardware.camera.external feature.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index d27b3e7..6d4402b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8049,6 +8049,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"; |