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

Commit 784e2c94 authored by Gil Dekel's avatar Gil Dekel
Browse files

SF: Move DisplayIdentification to SF/Display 

The DisplayIdentification logic is currently located in libs/ui but is
not (and probabably should not) be accessed by external clients of SF.
In addition, it holds display ID fabrication logic that should be
guarded by SF flags as we migrate from port-based to EDID-based display
IDs.

Move the DisplayIdentification logic and associated tests from libs/ui
back to SF.

Bug: 415035569
Flag: EXEMPT refactor
Test: DisplayIdentificationTest + presubmit
Change-Id: Ib96f5becb1d790e60634dec72b21ef15a875c23b
parent ed23e987

libs/ui/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ cc_library_shared { 
        "DebugUtils.cpp",

        "DependencyMonitor.cpp",

        "DeviceProductInfo.cpp",

        "DisplayIdentification.cpp",

        "DynamicDisplayInfo.cpp",

        "Fence.cpp",

        "FenceTime.cpp",

libs/ui/include/ui/StaticDisplayInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <optional>



#include <ui/DeviceProductInfo.h>

#include <ui/DisplayIdentification.h>

#include <ui/Rotation.h>

#include <ui/ScreenPartStatus.h>



namespace android::ui {

libs/ui/tests/Android.bp

+0 −11
Original line number Diff line number Diff line
@@ -44,17 +44,6 @@ cc_test { 
    ],

}



cc_test {

    name: "DisplayIdentification_test",

    shared_libs: ["libui"],

    static_libs: ["libgmock"],

    srcs: ["DisplayIdentification_test.cpp"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

}



cc_test {

    name: "FlattenableHelpers_test",

    shared_libs: ["libui"],

services/surfaceflinger/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ filegroup { 
        "BackgroundExecutor.cpp",

        "Client.cpp",

        "ClientCache.cpp",

        "Display/DisplayIdentification.cpp",

        "Display/DisplayModeController.cpp",

        "Display/DisplaySnapshot.cpp",

        "DisplayDevice.cpp",

services/surfaceflinger/CompositionEngine/include/compositionengine/Display.h

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
#pragma once



#include <cstdint>

#include <optional>



#include <ui/DisplayIdentification.h>



#include <compositionengine/Output.h>