Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08a12556 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Revert "Camera: Add new capability flags as system features as well" 

This reverts commit 6aee1d2b.
But leaves in some of the improved documentation.

Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
parent a9355bd1

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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";

core/java/android/content/pm/PackageManager.java

+0 −20
Original line number Diff line number Diff line
@@ -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

docs/html/guide/topics/manifest/uses-feature-element.jd

+1 −9
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ is sensitive to delays or lag in sound input or output.</td> 
       <td></td>

    </tr>

    <tr>

       <td rowspan="12">Camera</td>

       <td rowspan="10">Camera</td>

       <td><code>android.hardware.camera</code></td>

       <td>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 
  <td><code>android.hardware.camera.capability.raw</code></td>

  <td>The application uses a a camera device with the <code>RAW</code> capability.</td>

</tr>

<tr>

  <td><code>android.hardware.camera.capability.burst_capture</code></td>

  <td>The application uses a a camera device with the <code>BURST_CAPTURE</code> capability.</td>

</tr>

<tr>

  <td><code>android.hardware.camera.capability.read_sensor_settings</code></td>

  <td>The application uses a a camera device with the <code>READ_SENSOR_SETTINGS</code> capability.</td>

</tr>



<tr>

  <td>Infrared</td>