From 0e0eb14d5d199b65f29b405377d178c9db572914 Mon Sep 17 00:00:00 2001
From: Rupesh Bansal <brup@google.com>
Date: Tue, 27 Sep 2022 17:34:51 +0000
Subject: [PATCH] Removing the DEBUG flag check while logging traces

This CL has 2 changes
1. Not checking the DEBUG flag when logging the traces
2. Changing the utility used to log the trace to Trace.traceBegin(...)
   method. This is to log the traces in the SystemServer context, aginst
   the old method which logged the traces in the app context

Bug: 249306380
Test: Manual
Change-Id: Id32799cd9a11d984ae4bf9d69f59167b1636068b
---
 .../android/server/display/DisplayDeviceRepository.java  | 5 +++--
 .../android/server/display/DisplayPowerController.java   | 9 +++------
 .../android/server/display/DisplayPowerController2.java  | 9 +++------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/services/core/java/com/android/server/display/DisplayDeviceRepository.java b/services/core/java/com/android/server/display/DisplayDeviceRepository.java
index 4ac79901b9dc9..33a63a9907c2b 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceRepository.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceRepository.java
@@ -167,7 +167,8 @@ class DisplayDeviceRepository implements DisplayAdapter.Listener {
                 return;
             }
             if (DEBUG) {
-                Trace.beginSection("handleDisplayDeviceChanged");
+                Trace.traceBegin(Trace.TRACE_TAG_POWER,
+                        "handleDisplayDeviceChanged");
             }
             int diff = device.mDebugLastLoggedDeviceInfo.diff(info);
             if (diff == DisplayDeviceInfo.DIFF_STATE) {
@@ -189,7 +190,7 @@ class DisplayDeviceRepository implements DisplayAdapter.Listener {
             device.applyPendingDisplayDeviceInfoChangesLocked();
             sendEventLocked(device, DISPLAY_DEVICE_EVENT_CHANGED);
             if (DEBUG) {
-                Trace.endSection();
+                Trace.traceEnd(Trace.TRACE_TAG_POWER);
             }
         }
     }
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 8d3e040bf4e6d..52d630b800c6f 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1172,13 +1172,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
     }
 
     private void updatePowerState() {
-        if (DEBUG) {
-            Trace.beginSection("DisplayPowerController#updatePowerState");
-        }
+        Trace.traceBegin(Trace.TRACE_TAG_POWER,
+                "DisplayPowerController#updatePowerState");
         updatePowerStateInternal();
-        if (DEBUG) {
-            Trace.endSection();
-        }
+        Trace.traceEnd(Trace.TRACE_TAG_POWER);
     }
 
     private void updatePowerStateInternal() {
diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java
index c734095a47435..ab9bf0e0d1d4e 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController2.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController2.java
@@ -1172,13 +1172,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
     }
 
     private void updatePowerState() {
-        if (DEBUG) {
-            Trace.beginSection("DisplayPowerController#updatePowerState");
-        }
+        Trace.traceBegin(Trace.TRACE_TAG_POWER,
+                "DisplayPowerController#updatePowerState");
         updatePowerStateInternal();
-        if (DEBUG) {
-            Trace.endSection();
-        }
+        Trace.traceEnd(Trace.TRACE_TAG_POWER);
     }
 
     private void updatePowerStateInternal() {