From 08a125562c9af620e83e9f96c7810eae871d6067 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Wed, 3 Dec 2014 18:54:50 +0000 Subject: [PATCH] Revert "Camera: Add new capability flags as system features as well" This reverts commit 6aee1d2ba52cf7f44c9355f279844b8a937903da. But leaves in some of the improved documentation. Bug: 18281970 Bug: 18573576 Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb --- api/current.txt | 2 -- .../android/content/pm/PackageManager.java | 20 ------------------- .../topics/manifest/uses-feature-element.jd | 10 +--------- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/api/current.txt b/api/current.txt index 53aa4a2e94283..8376efe750534 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8782,11 +8782,9 @@ 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_CAPABILITY_BURST_CAPTURE = "android.hardware.camera.capability.burst_capture"; field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_MANUAL_POST_PROCESSING = "android.hardware.camera.capability.manual_post_processing"; field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_MANUAL_SENSOR = "android.hardware.camera.capability.manual_sensor"; field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_RAW = "android.hardware.camera.capability.raw"; - field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_READ_SENSOR_SETTINGS = "android.hardware.camera.capability.read_sensor_settings"; 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"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 5c705e6ba205f..e9f7c50431b53 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1077,26 +1077,6 @@ public abstract class PackageManager { public static final String FEATURE_CAMERA_CAPABILITY_RAW = "android.hardware.camera.capability.raw"; - /** - * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: At least one - * of the cameras on the device supports the - * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE BURST_CAPTURE} - * capability level. - */ - @SdkConstant(SdkConstantType.FEATURE) - public static final String FEATURE_CAMERA_CAPABILITY_BURST_CAPTURE = - "android.hardware.camera.capability.burst_capture"; - - /** - * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: At least one - * of the cameras on the device supports the - * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS READ_SENSOR_SETTINGS} - * capability level. - */ - @SdkConstant(SdkConstantType.FEATURE) - public static final String FEATURE_CAMERA_CAPABILITY_READ_SENSOR_SETTINGS = - "android.hardware.camera.capability.read_sensor_settings"; - /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device is capable of communicating with diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index 775c42426a1c1..59bf71c67559c 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -560,7 +560,7 @@ is sensitive to delays or lag in sound input or output. - Camera + Camera android.hardware.camera The application uses the device's camera. If the device supports multiple cameras, the application uses the camera that facing @@ -609,14 +609,6 @@ external camera device if one is connected. Use this in preference to android.hardware.camera.capability.raw The application uses a a camera device with the RAW capability. - - android.hardware.camera.capability.burst_capture - The application uses a a camera device with the BURST_CAPTURE capability. - - - android.hardware.camera.capability.read_sensor_settings - The application uses a a camera device with the READ_SENSOR_SETTINGS capability. - Infrared