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

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

Merge "Camera: Remove code for log_ultrawide_usage" into main

parents 23ff628d 2384119c

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

+2 −4
Original line number Diff line number Diff line
@@ -379,9 +379,7 @@ public class CameraServiceProxy extends SystemService 
                streamCount = mStreamStats.size();

            }

            if (CameraServiceProxy.DEBUG) {

                String ultrawideDebug = Flags.logUltrawideUsage()

                        ? ", wideAngleUsage " + mUsedUltraWide

                        : "";

                String ultrawideDebug = ", wideAngleUsage " + mUsedUltraWide;

                String zoomOverrideDebug = Flags.logZoomOverrideUsage()

                        ? ", zoomOverrideUsage " + mUsedZoomOverride

                        : "";
@@ -1338,7 +1336,7 @@ public class CameraServiceProxy extends SystemService 
        List<CameraStreamStats> streamStats = cameraState.getStreamStats();

        String userTag = cameraState.getUserTag();

        int videoStabilizationMode = cameraState.getVideoStabilizationMode();

        boolean usedUltraWide = Flags.logUltrawideUsage() ? cameraState.getUsedUltraWide() : false;

        boolean usedUltraWide = cameraState.getUsedUltraWide();

        boolean usedZoomOverride =

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

        long logId = cameraState.getLogId();