camera2: legacy: Don't set the @hide frame number metadata

Change-Id: Id1c8292444a45a97228d5c95f23f6d1f8171d3b5

3 files changed, 3 insertions, 9 deletions

diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
index cbb8ee2..633bada 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
@@ -601,7 +601,6 @@ public class LegacyMetadataMapper {
                     CaptureResult.JPEG_QUALITY                                     ,
                     CaptureResult.JPEG_THUMBNAIL_QUALITY                           ,
                     CaptureResult.LENS_FOCAL_LENGTH                                ,
-                    CaptureResult.REQUEST_FRAME_COUNT                              ,
                     CaptureResult.REQUEST_PIPELINE_DEPTH                           ,
                     CaptureResult.SCALER_CROP_REGION                               ,
                     CaptureResult.SENSOR_TIMESTAMP                                 ,
diff --git a/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java b/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java
index 58c3984..07852b9 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java
@@ -57,12 +57,11 @@ public class LegacyResultMapper {
      *
      * @param legacyRequest a non-{@code null} legacy request containing the latest parameters
      * @param timestamp the timestamp to use for this result in nanoseconds.
-     * @param frameCounter a monotonically increasing frame counter for the result
      *
      * @return {@link CameraMetadataNative} object containing result metadata.
      */
     public CameraMetadataNative cachedConvertResultMetadata(
-            LegacyRequest legacyRequest, long timestamp, long frameCounter) {
+            LegacyRequest legacyRequest, long timestamp) {
         CameraMetadataNative result;
         boolean cached;
 
@@ -86,17 +85,13 @@ public class LegacyResultMapper {
          * Unconditionally set fields that change in every single frame
          */
         {
-            // request.frameCounter
-            result.set(REQUEST_FRAME_COUNT, (int)frameCounter);
-            // TODO: fix CaptureResult#getFrameNumber not to need this key
-
             // sensor.timestamp
             result.set(SENSOR_TIMESTAMP, timestamp);
         }
 
         if (VERBOSE) {
             Log.v(TAG, "cachedConvertResultMetadata - cached? " + cached +
-                    " frameCounter = " + frameCounter + " timestamp = " + timestamp);
+                    " timestamp = " + timestamp);
 
             Log.v(TAG, "----- beginning of result dump ------");
             result.dumpToLog();
diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
index bcee315..c556c32 100644
--- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
+++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
@@ -674,7 +674,7 @@ public class RequestThreadManager {
                         }
 
                         CameraMetadataNative result = mMapper.cachedConvertResultMetadata(
-                                mLastRequest, timestampMutable.value, holder.getFrameNumber());
+                                mLastRequest, timestampMutable.value);
                         // Update AF state
                         mFocusStateMapper.mapResultTriggers(result);