diff --git a/api/current.txt b/api/current.txt index 0927ffa11f2fa..3f2f7c4422f7c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14516,7 +14516,7 @@ package android.hardware { method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback); method public final void unlock(); field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE"; - field public static final deprecated java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; + field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2 field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64 field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1 diff --git a/api/system-current.txt b/api/system-current.txt index 24cc3dee67261..9d436812b3e8f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -15296,7 +15296,7 @@ package android.hardware { method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback); method public final void unlock(); field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE"; - field public static final deprecated java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; + field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2 field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64 field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1 diff --git a/api/test-current.txt b/api/test-current.txt index c9bda249832bc..4c1ad18629d75 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -14562,7 +14562,7 @@ package android.hardware { method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback); method public final void unlock(); field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE"; - field public static final deprecated java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; + field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2 field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64 field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1 diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 061346c18bbe2..aa35a6610db7a 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -189,7 +189,7 @@ public class Camera { * *
In {@link android.os.Build.VERSION_CODES#O Android O} this broadcast has been brought * back, but only for registered receivers. Apps that are actively running can - * against listen to the broadcast if they want an immediate clear signal about a picture + * again listen to the broadcast if they want an immediate clear signal about a picture * being taken, however anything doing heavy work (or needing to be launched) as a result of * this should still use JobScheduler.
*/ @@ -208,12 +208,11 @@ public class Camera { * *In {@link android.os.Build.VERSION_CODES#O Android O} this broadcast has been brought * back, but only for registered receivers. Apps that are actively running can - * against listen to the broadcast if they want an immediate clear signal about a video + * again listen to the broadcast if they want an immediate clear signal about a video * being taken, however anything doing heavy work (or needing to be launched) as a result of * this should still use JobScheduler.
*/ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @Deprecated public static final String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; /**