commit a5ec9213f9848e3c8e904f182a8fbdb2e65aec30
author Zhijun He <zhijunhe@google.com> Thu Apr 17 20:44:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 17 20:44:21 2014 +0000
tree 74f050742c06563dc67cb62301f652c01979ab66
parent fdc79a8e9af9f4140f99117c997821e6eeb2c7d2
parent f60194b115edb4797464dd3714ed9d03f3ff21ff

am f60194b1: Merge "Camera2: Update sync.frameNumber tag"

* commit 'f60194b115edb4797464dd3714ed9d03f3ff21ff':
  Camera2: Update sync.frameNumber tag

core/java/android/hardware/camera2/CaptureResult.java

diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index 70d3c63..d8981c8 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -2134,8 +2134,8 @@
      * @see #SYNC_FRAME_NUMBER_UNKNOWN
      * @hide
      */
-    public static final Key<Integer> SYNC_FRAME_NUMBER =
-            new Key<Integer>("android.sync.frameNumber", int.class);
+    public static final Key<Long> SYNC_FRAME_NUMBER =
+            new Key<Long>("android.sync.frameNumber", long.class);
 
     /*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~
      * End generated code