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

Commit 1caeb10a authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

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
parent 825bfb4f

api/current.txt

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

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

+9 −1
Original line number Diff line number Diff line
@@ -894,11 +894,19 @@ public abstract class PackageManager { 
    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device has at least one camera pointing in

     * some direction.

     * some direction, or can support an external camera being connected to it.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device can support having an external camera connected to it.

     * The external camera may not always be connected or available to applications to use.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_CAMERA_EXTERNAL = "android.hardware.camera.external";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device's camera supports flash.

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

+9 −4
Original line number Diff line number Diff line
@@ -584,9 +584,14 @@ is sensitive to delays or lag in sound input or output.</td> 
</tr>

<tr>

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

  <td>The application uses at least one camera facing in any direction. Use this

in preference to <code>android.hardware.camera</code> if a back-facing camera is

not required.</td>

  <td>The application uses at least one camera facing in any direction, or an

external camera device if one is connected. Use this in preference to

<code>android.hardware.camera</code> if a back-facing camera is not required.

  </td>

</tr>

<tr>

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

  <td>The application uses an external camera device if one is connected.</td>

</tr>



<tr>