diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-12-04 20:44:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 20:44:58 +0000 |
| commit | 1aef3b1eb4598e0c9b8e44c15bc667f5a0fff4a5 (patch) | |
| tree | 1efb3b7956f0fc8e4fa8077b4907da7143a06f8e /core/java/android/content | |
| parent | c22369be46346974165ef8f8256acdb768860518 (diff) | |
| parent | 431b65d11fa79ee1acf55e1de0d074fe9913a51d (diff) | |
| download | frameworks_base-1aef3b1eb4598e0c9b8e44c15bc667f5a0fff4a5.zip frameworks_base-1aef3b1eb4598e0c9b8e44c15bc667f5a0fff4a5.tar.gz frameworks_base-1aef3b1eb4598e0c9b8e44c15bc667f5a0fff4a5.tar.bz2 | |
am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
* commit '431b65d11fa79ee1acf55e1de0d074fe9913a51d':
Revert "Camera: Add new capability flags as system features as well"
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 5c705e6..e9f7c50 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1078,26 +1078,6 @@ public abstract class PackageManager { "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 * consumer IR devices. |