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

Commit 6f1f1631 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove the last 2 uses of displayTopology flags" into main

parents ea0a2cd6 53334106

core/java/android/hardware/display/DisplayManagerGlobal.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -62,6 +62,7 @@ import android.view.Display; 
import android.view.DisplayAdjustments;

import android.view.DisplayAdjustments;

import android.view.DisplayInfo;

import android.view.DisplayInfo;

import android.view.Surface;

import android.view.Surface;

import android.window.DesktopExperienceFlags;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.server.display.feature.flags.Flags;

import com.android.server.display.feature.flags.Flags;
@@ -1435,7 +1436,7 @@ public final class DisplayManagerGlobal { 
    @RequiresPermission(MANAGE_DISPLAYS)

    @RequiresPermission(MANAGE_DISPLAYS)

    public void registerTopologyListener(@NonNull @CallbackExecutor Executor executor,

    public void registerTopologyListener(@NonNull @CallbackExecutor Executor executor,

            @NonNull Consumer<DisplayTopology> listener, String packageName) {

            @NonNull Consumer<DisplayTopology> listener, String packageName) {

        if (!Flags.displayTopology()) {

        if (!DesktopExperienceFlags.DISPLAY_TOPOLOGY.isTrue()) {

            return;

            return;

        }

        }

        if (listener == null) {

        if (listener == null) {
@@ -1461,7 +1462,7 @@ public final class DisplayManagerGlobal { 
     */

     */

    @RequiresPermission(MANAGE_DISPLAYS)

    @RequiresPermission(MANAGE_DISPLAYS)

    public void unregisterTopologyListener(@NonNull Consumer<DisplayTopology> listener) {

    public void unregisterTopologyListener(@NonNull Consumer<DisplayTopology> listener) {

        if (!Flags.displayTopology()) {

        if (!DesktopExperienceFlags.DISPLAY_TOPOLOGY.isTrue()) {

            return;

            return;

        }

        }

        if (listener == null) {

        if (listener == null) {