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

Commit a9836bdb authored by Gil Dekel's avatar Gil Dekel Committed by Android (Google) Code Review
Browse files

Merge changes from topic "move_DisplayIdentification_logic_to_SF" into main 

* changes:
  SF: Move DisplayIdentification to SF/Display
  end2end: Remove DisplayIdentification dependency
  libs/ui: Fix implicit cast in parseEdid()
  libs/ui: Move ScreenPartStatus into its own header
parents 073aae7a 784e2c94

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/ScreenPartStatus.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <cstdint>



namespace android {



// These values must match the ones in ScreenPartStatus.aidl file in the composer HAL

enum class ScreenPartStatus : uint8_t {

    // Device cannot differentiate an original screen from a replaced screen.

    UNSUPPORTED = 0,

    // Device has the original screen it was manufactured with.

    ORIGINAL = 1,

    // Device has a replaced screen.

    REPLACED = 2,



    ftl_last = REPLACED

};



} // namespace android

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",