Merge "Remove refresh rate subscription from ResolutionTracker" into main

1 files changed, 13 insertions, 4 deletions

diff --git a/core/java/com/android/internal/jank/DisplayResolutionTracker.java b/core/java/com/android/internal/jank/DisplayResolutionTracker.java
index 5d66b3c10197..74153157df4d 100644
--- a/core/java/com/android/internal/jank/DisplayResolutionTracker.java
+++ b/core/java/com/android/internal/jank/DisplayResolutionTracker.java
@@ -142,14 +142,23 @@ public class DisplayResolutionTracker {
     public interface DisplayInterface {
         /** Reurns an implementation wrapping {@link DisplayManagerGlobal}. */
         static DisplayInterface getDefault(@Nullable Handler handler) {
+            long displayEventsToBeSubscribed;
+            if (com.android.server.display.feature.flags.Flags
+                    .displayListenerPerformanceImprovements()
+                    && com.android.server.display.feature.flags.Flags
+                    .delayImplicitRrRegistrationUntilRrAccessed()) {
+                displayEventsToBeSubscribed = DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED
+                        | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED;
+            } else {
+                displayEventsToBeSubscribed = DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED
+                        | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED
+                        | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_REFRESH_RATE;
+            }
             DisplayManagerGlobal manager = DisplayManagerGlobal.getInstance();
             return new DisplayInterface() {
                 @Override
                 public void registerDisplayListener(DisplayManager.DisplayListener listener) {
-                    manager.registerDisplayListener(listener, handler,
-                            DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED
-                                    | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED
-                                    | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_REFRESH_RATE,
+                    manager.registerDisplayListener(listener, handler, displayEventsToBeSubscribed,
                             ActivityThread.currentPackageName());
                 }