Unhide new preview callback methods. (5b9bcda3) · Commits · e / os / android_frameworks_base

api/current.xml

+64 −38

Original line number	Diff line number	Diff line
		@@ -45243,209 +45243,209 @@
		visibility="public"
		>
		</field>
		<field name="FEATURE_CAMERA"
		<field name="FEATURE_BLUETOOTH"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.camera""
		value=""android.hardware.bluetooth""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_CAMERA_AUTOFOCUS"
		<field name="FEATURE_CAMERA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.camera.autofocus""
		value=""android.hardware.camera""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_CAMERA_FLASH"
		<field name="FEATURE_CAMERA_AUTOFOCUS"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.camera.flash""
		value=""android.hardware.camera.autofocus""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_LIVE_WALLPAPER"
		<field name="FEATURE_CAMERA_FLASH"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.software.live_wallpaper""
		value=""android.hardware.camera.flash""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_SENSOR_LIGHT"
		<field name="FEATURE_LIVE_WALLPAPER"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.sensor.light""
		value=""android.software.live_wallpaper""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_SENSOR_PROXIMITY"
		<field name="FEATURE_LOCATION"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.sensor.proximity""
		value=""android.hardware.location""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TELEPHONY"
		<field name="FEATURE_LOCATION_GPS"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.telephony""
		value=""android.hardware.location.gps""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TELEPHONY_CDMA"
		<field name="FEATURE_LOCATION_NETWORK"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.telephony.cdma""
		value=""android.hardware.location.network""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TELEPHONY_GSM"
		<field name="FEATURE_MICROPHONE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.telephony.gsm""
		value=""android.hardware.microphone""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"
		<field name="FEATURE_SENSOR_ACCELEROMETER"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.touchscreen.multitouch""
		value=""android.hardware.sensor.accelerometer""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT"
		<field name="FEATURE_SENSOR_COMPASS"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.touchscreen.multitouch.distinct""
		value=""android.hardware.sensor.compass""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_BLUETOOTH"
		<field name="FEATURE_SENSOR_LIGHT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.bluetooth""
		value=""android.hardware.sensor.light""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_LOCATION"
		<field name="FEATURE_SENSOR_PROXIMITY"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.location""
		value=""android.hardware.sensor.proximity""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_LOCATION_GPS"
		<field name="FEATURE_TELEPHONY"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.location.gps""
		value=""android.hardware.telephony""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_LOCATION_NETWORK"
		<field name="FEATURE_TELEPHONY_CDMA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.location.network""
		value=""android.hardware.telephony.cdma""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_MICROPHONE"
		<field name="FEATURE_TELEPHONY_GSM"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.microphone""
		value=""android.hardware.telephony.gsm""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_WIFI"
		<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.wifi""
		value=""android.hardware.touchscreen.multitouch""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_SENSOR_ACCELEROMETER"
		<field name="FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.sensor.accelerometer""
		value=""android.hardware.touchscreen.multitouch.distinct""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_SENSOR_COMPASS"
		<field name="FEATURE_WIFI"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.sensor.compass""
		value=""android.hardware.wifi""
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -71563,6 +71563,19 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="addCallbackBuffer"
		return="void"
		abstract="false"
		native="true"
		synchronized="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="callbackBuffer" type="byte[]">
		</parameter>
		</method>
		<method name="autoFocus"
		return="void"
		abstract="false"
		@@ -71709,6 +71722,19 @@
		<parameter name="cb" type="android.hardware.Camera.PreviewCallback">
		</parameter>
		</method>
		<method name="setPreviewCallbackWithBuffer"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="cb" type="android.hardware.Camera.PreviewCallback">
		</parameter>
		</method>
		<method name="setPreviewDisplay"
		return="void"
		abstract="false"

core/java/android/hardware/Camera.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -261,7 +261,6 @@ public class Camera {
		* setPreviewCallback, or to this method with a null callback parameter.
		*
		* @param cb A callback object that receives a copy of the preview frame. A null value will clear the queue.
		* @hide
		*/
		public final void setPreviewCallbackWithBuffer(PreviewCallback cb) {
		mPreviewCallback = cb;
		@@ -273,14 +272,14 @@ public class Camera {
		/**
		* Adds a pre-allocated buffer to the callback buffer queue.
		* Preview width and height can be determined from getPreviewSize, and bitsPerPixel can be
		* found from from {@link android.hardware.Camera.Parameters#getPreviewFormat()} and
		* {@link android.graphics.ImageFormat#getBitsPerPixel(int)}
		* found from {@link android.hardware.Camera.Parameters#getPreviewFormat()}
		* and {@link android.graphics.ImageFormat#getBitsPerPixel(int)}.
		*
		* Alternatively, a buffer from a previous callback may be passed in or used
		* to determine the size of new preview frame buffers.
		*
		* @param callbackBuffer The buffer to register. Size should be width * height * bitsPerPixel / 8.
		* @hide
		* @see #setPreviewCallbackWithBuffer(PreviewCallback)
		*/
		public native final void addCallbackBuffer(byte[] callbackBuffer);