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

Commit 2a5a9752 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove code for log_zoom_override_usage" into main

parents e689c821 6277c9fa

services/core/java/com/android/server/camera/CameraServiceProxy.java

+2 −5
Original line number Diff line number Diff line
@@ -380,9 +380,7 @@ public class CameraServiceProxy extends SystemService 
            }

            if (CameraServiceProxy.DEBUG) {

                String ultrawideDebug = ", wideAngleUsage " + mUsedUltraWide;

                String zoomOverrideDebug = Flags.logZoomOverrideUsage()

                        ? ", zoomOverrideUsage " + mUsedZoomOverride

                        : "";

                String zoomOverrideDebug = ", zoomOverrideUsage " + mUsedZoomOverride;

                String mostRequestedFpsRangeDebug = Flags.analytics24q3()

                        ? ", mostRequestedFpsRange " + mMostRequestedFpsRange

                        : "";
@@ -1337,8 +1335,7 @@ public class CameraServiceProxy extends SystemService 
        String userTag = cameraState.getUserTag();

        int videoStabilizationMode = cameraState.getVideoStabilizationMode();

        boolean usedUltraWide = cameraState.getUsedUltraWide();

        boolean usedZoomOverride =

                Flags.logZoomOverrideUsage() ? cameraState.getUsedZoomOverride() : false;

        boolean usedZoomOverride = cameraState.getUsedZoomOverride();

        long logId = cameraState.getLogId();

        int sessionIdx = cameraState.getSessionIndex();

        CameraExtensionSessionStats extSessionStats = cameraState.getExtensionSessionStats();