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

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

Merge "NEW_API: Add getTimestamp() to SurfaceTexture."

parents 26f9c2eb e309a0fd

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -86749,6 +86749,17 @@ 
<parameter name="texName" type="int">

</parameter>

</constructor>

<method name="getTimestamp"

 return="long"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getTransformMatrix"

 return="void"

 abstract="false"

core/java/android/hardware/Camera.java

+6 −0
Original line number Diff line number Diff line
@@ -374,6 +374,12 @@ public class Camera { 
     * The preview surface texture may not otherwise change while preview is

     * running.

     *

     * The timestamps provided by {@link SurfaceTexture#getTimestamp()} for a

     * SurfaceTexture set as the preview texture have an unspecified zero point,

     * and cannot be directly compared between different cameras or different

     * instances of the same camera, or across multiple runs of the same

     * program.

     *

     * @param surfaceTexture the {@link SurfaceTexture} to which the preview

     *     images are to be sent or null to remove the current preview surface

     *     texture

graphics/java/android/graphics/SurfaceTexture.java

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ public class SurfaceTexture { 
     * the SurfaceTexture. Unless otherwise specified by the image source, timestamps cannot

     * generally be compared across SurfaceTexture instances, or across multiple program

     * invocations. It is mostly useful for determining time offsets between subsequent frames.

     * @hide

     */

    public long getTimestamp() {

        return nativeGetTimestamp();