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

Commit a91c9f9f authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev

parents 7b770b0e 72b4db15

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6619,6 +6619,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";

    field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth";

    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_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 −1
Original line number Diff line number Diff line
@@ -837,7 +837,6 @@ public abstract class PackageManager { 
     * Feature for {@link #getSystemAvailableFeatures} and

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

     * some direction.

     * @hide

     */

    @SdkConstant(SdkConstantType.FEATURE)

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

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

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

    </tr>

    <tr>

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

       <td rowspan="5">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
@@ -583,6 +583,12 @@ is sensitive to delays or lag in sound input or output.</td> 
  <td><code>android.hardware.camera.front</code></td>

  <td>Subfeature. The application uses a front-facing camera on the device.</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>

</tr>



<tr>

  <td rowspan="3">Location</td>