summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2017-04-28 18:10:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-04-28 18:10:39 +0000
commit9cd47a8ff260b694381db70a675e1f4f38d6f683 (patch)
tree6f5c80957a4b35b24ddcdbebd6a88c6dcf1eee2f /core/java/android
parent8bfbb0af21935ff9a115acb3e525e4112bc05ba5 (diff)
parentc154195d27c51ffd8a3a114de5e462a8b1fdfa8b (diff)
Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/hardware/Camera.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 061346c18bbe..aa35a6610db7 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -189,7 +189,7 @@ public class Camera {
*
* <p>In {@link android.os.Build.VERSION_CODES#O Android O} this broadcast has been brought
* back, but only for <em>registered</em> 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.</p>
*/
@@ -208,12 +208,11 @@ public class Camera {
*
* <p>In {@link android.os.Build.VERSION_CODES#O Android O} this broadcast has been brought
* back, but only for <em>registered</em> 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.</p>
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
- @Deprecated
public static final String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";
/**