Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev (9cd47a8f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -14494,7 +14494,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

+1 −1

Original line number	Diff line number	Diff line
		@@ -15273,7 +15273,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

+1 −1

Original line number	Diff line number	Diff line
		@@ -14540,7 +14540,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

+2 −3

Original line number	Diff line number	Diff line
		@@ -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";

		/**