diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index 3e6d49f..d7ea45b 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -155,9 +155,7 @@
         "DisplayHardware/AidlComposerHal.cpp",
         "DisplayHardware/HidlComposerHal.cpp",
         "DisplayHardware/ComposerHal.cpp",
-        "DisplayHardware/DisplayIdentification.cpp",
         "DisplayHardware/FramebufferSurface.cpp",
-        "DisplayHardware/Hash.cpp",
         "DisplayHardware/HWC2.cpp",
         "DisplayHardware/HWComposer.cpp",
         "DisplayHardware/PowerAdvisor.cpp",
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/Display.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/Display.h
index 01dd534..16cb41b 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/Display.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/Display.h
@@ -19,7 +19,7 @@
 #include <cstdint>
 #include <optional>
 
-#include "DisplayHardware/DisplayIdentification.h"
+#include <ui/DisplayIdentification.h>
 
 #include <compositionengine/Output.h>
 
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h
index 6cb12dd..d8644a4 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h
@@ -34,7 +34,7 @@
 #include <utils/StrongPointer.h>
 #include <utils/Vector.h>
 
-#include "DisplayHardware/DisplayIdentification.h"
+#include <ui/DisplayIdentification.h>
 
 namespace android {
 
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/OutputLayer.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/OutputLayer.h
index a2824f5..bf5184e 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/OutputLayer.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/OutputLayer.h
@@ -28,8 +28,8 @@
 #pragma clang diagnostic ignored "-Wconversion"
 #pragma clang diagnostic ignored "-Wextra"
 
+#include <ui/DisplayIdentification.h>
 #include "DisplayHardware/ComposerHal.h"
-#include "DisplayHardware/DisplayIdentification.h"
 
 #include "LayerFE.h"
 
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
index 3571e11..b777241 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
@@ -26,7 +26,8 @@
 #include <ui/PixelFormat.h>
 #include <ui/Size.h>
 
-#include "DisplayHardware/DisplayIdentification.h"
+#include <ui/DisplayIdentification.h>
+
 #include "DisplayHardware/HWComposer.h"
 #include "DisplayHardware/PowerAdvisor.h"
 
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayer.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayer.h
index 0082dac..d64d676 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayer.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayer.h
@@ -25,7 +25,7 @@
 #include <ui/FloatRect.h>
 #include <ui/Rect.h>
 
-#include "DisplayHardware/DisplayIdentification.h"
+#include <ui/DisplayIdentification.h>
 
 #include <aidl/android/hardware/graphics/composer3/Composition.h>
 
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/mock/Display.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/mock/Display.h
index 08a8b84..6fb3e08 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/mock/Display.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/mock/Display.h
@@ -22,8 +22,7 @@
 #include <compositionengine/mock/Output.h>
 #include <gmock/gmock.h>
 #include <system/window.h>
-
-#include "DisplayHardware/DisplayIdentification.h"
+#include <ui/DisplayIdentification.h>
 
 namespace android::compositionengine::mock {
 
diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h
index d2accaa..0c9063d 100644
--- a/services/surfaceflinger/DisplayDevice.h
+++ b/services/surfaceflinger/DisplayDevice.h
@@ -41,7 +41,7 @@
 
 #include "MainThreadGuard.h"
 
-#include "DisplayHardware/DisplayIdentification.h"
+#include <ui/DisplayIdentification.h>
 #include "DisplayHardware/DisplayMode.h"
 #include "DisplayHardware/Hal.h"
 #include "DisplayHardware/PowerAdvisor.h"
diff --git a/services/surfaceflinger/DisplayHardware/DisplayIdentification.cpp b/services/surfaceflinger/DisplayHardware/DisplayIdentification.cpp
deleted file mode 100644
index 83c2b2e..0000000
--- a/services/surfaceflinger/DisplayHardware/DisplayIdentification.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-
-#undef LOG_TAG
-#define LOG_TAG "DisplayIdentification"
-
-#include <algorithm>
-#include <cctype>
-#include <numeric>
-#include <optional>
-
-#include <log/log.h>
-
-#include "DisplayIdentification.h"
-#include "Hash.h"
-
-namespace android {
-namespace {
-
-using byte_view = std::basic_string_view<uint8_t>;
-
-constexpr size_t kEdidBlockSize = 128;
-constexpr size_t kEdidHeaderLength = 5;
-
-constexpr uint16_t kVirtualEdidManufacturerId = 0xffffu;
-
-std::optional<uint8_t> getEdidDescriptorType(const byte_view& view) {
-    if (view.size() < kEdidHeaderLength || view[0] || view[1] || view[2] || view[4]) {
-        return {};
-    }
-
-    return view[3];
-}
-
-std::string_view parseEdidText(const byte_view& view) {
-    std::string_view text(reinterpret_cast<const char*>(view.data()), view.size());
-    text = text.substr(0, text.find('\n'));
-
-    if (!std::all_of(text.begin(), text.end(), ::isprint)) {
-        ALOGW("Invalid EDID: ASCII text is not printable.");
-        return {};
-    }
-
-    return text;
-}
-
-// Big-endian 16-bit value encodes three 5-bit letters where A is 0b00001.
-template <size_t I>
-char getPnpLetter(uint16_t id) {
-    static_assert(I < 3);
-    const char letter = 'A' + (static_cast<uint8_t>(id >> ((2 - I) * 5)) & 0b00011111) - 1;
-    return letter < 'A' || letter > 'Z' ? '\0' : letter;
-}
-
-DeviceProductInfo buildDeviceProductInfo(const Edid& edid) {
-    DeviceProductInfo info;
-    info.name.assign(edid.displayName);
-    info.productId = std::to_string(edid.productId);
-    info.manufacturerPnpId = edid.pnpId;
-
-    constexpr uint8_t kModelYearFlag = 0xff;
-    constexpr uint32_t kYearOffset = 1990;
-
-    const auto year = edid.manufactureOrModelYear + kYearOffset;
-    if (edid.manufactureWeek == kModelYearFlag) {
-        info.manufactureOrModelDate = DeviceProductInfo::ModelYear{.year = year};
-    } else if (edid.manufactureWeek == 0) {
-        DeviceProductInfo::ManufactureYear date;
-        date.year = year;
-        info.manufactureOrModelDate = date;
-    } else {
-        DeviceProductInfo::ManufactureWeekAndYear date;
-        date.year = year;
-        date.week = edid.manufactureWeek;
-        info.manufactureOrModelDate = date;
-    }
-
-    if (edid.cea861Block && edid.cea861Block->hdmiVendorDataBlock) {
-        const auto& address = edid.cea861Block->hdmiVendorDataBlock->physicalAddress;
-        info.relativeAddress = {address.a, address.b, address.c, address.d};
-    }
-    return info;
-}
-
-Cea861ExtensionBlock parseCea861Block(const byte_view& block) {
-    Cea861ExtensionBlock cea861Block;
-
-    constexpr size_t kRevisionNumberOffset = 1;
-    cea861Block.revisionNumber = block[kRevisionNumberOffset];
-
-    constexpr size_t kDetailedTimingDescriptorsOffset = 2;
-    const size_t dtdStart =
-            std::min(kEdidBlockSize, static_cast<size_t>(block[kDetailedTimingDescriptorsOffset]));
-
-    // Parse data blocks.
-    for (size_t dataBlockOffset = 4; dataBlockOffset < dtdStart;) {
-        const uint8_t header = block[dataBlockOffset];
-        const uint8_t tag = header >> 5;
-        const size_t bodyLength = header & 0b11111;
-        constexpr size_t kDataBlockHeaderSize = 1;
-        const size_t dataBlockSize = bodyLength + kDataBlockHeaderSize;
-
-        if (block.size() < dataBlockOffset + dataBlockSize) {
-            ALOGW("Invalid EDID: CEA 861 data block is truncated.");
-            break;
-        }
-
-        const byte_view dataBlock(block.data() + dataBlockOffset, dataBlockSize);
-        constexpr uint8_t kVendorSpecificDataBlockTag = 0x3;
-
-        if (tag == kVendorSpecificDataBlockTag) {
-            const uint32_t ieeeRegistrationId = static_cast<uint32_t>(
-                    dataBlock[1] | (dataBlock[2] << 8) | (dataBlock[3] << 16));
-            constexpr uint32_t kHdmiIeeeRegistrationId = 0xc03;
-
-            if (ieeeRegistrationId == kHdmiIeeeRegistrationId) {
-                const uint8_t a = dataBlock[4] >> 4;
-                const uint8_t b = dataBlock[4] & 0b1111;
-                const uint8_t c = dataBlock[5] >> 4;
-                const uint8_t d = dataBlock[5] & 0b1111;
-                cea861Block.hdmiVendorDataBlock =
-                        HdmiVendorDataBlock{.physicalAddress = HdmiPhysicalAddress{a, b, c, d}};
-            } else {
-                ALOGV("Ignoring vendor specific data block for vendor with IEEE OUI %x",
-                      ieeeRegistrationId);
-            }
-        } else {
-            ALOGV("Ignoring CEA-861 data block with tag %x", tag);
-        }
-        dataBlockOffset += bodyLength + kDataBlockHeaderSize;
-    }
-
-    return cea861Block;
-}
-
-} // namespace
-
-bool isEdid(const DisplayIdentificationData& data) {
-    const uint8_t kMagic[] = {0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0};
-    return data.size() >= sizeof(kMagic) &&
-            std::equal(std::begin(kMagic), std::end(kMagic), data.begin());
-}
-
-std::optional<Edid> parseEdid(const DisplayIdentificationData& edid) {
-    if (edid.size() < kEdidBlockSize) {
-        ALOGW("Invalid EDID: structure is truncated.");
-        // Attempt parsing even if EDID is malformed.
-    } else {
-        ALOGW_IF(std::accumulate(edid.begin(), edid.begin() + kEdidBlockSize,
-                                 static_cast<uint8_t>(0)),
-                 "Invalid EDID: structure does not checksum.");
-    }
-
-    constexpr size_t kManufacturerOffset = 8;
-    if (edid.size() < kManufacturerOffset + sizeof(uint16_t)) {
-        ALOGE("Invalid EDID: manufacturer ID is truncated.");
-        return {};
-    }
-
-    // Plug and play ID encoded as big-endian 16-bit value.
-    const uint16_t manufacturerId =
-            static_cast<uint16_t>((edid[kManufacturerOffset] << 8) | edid[kManufacturerOffset + 1]);
-
-    const auto pnpId = getPnpId(manufacturerId);
-    if (!pnpId) {
-        ALOGE("Invalid EDID: manufacturer ID is not a valid PnP ID.");
-        return {};
-    }
-
-    constexpr size_t kProductIdOffset = 10;
-    if (edid.size() < kProductIdOffset + sizeof(uint16_t)) {
-        ALOGE("Invalid EDID: product ID is truncated.");
-        return {};
-    }
-    const uint16_t productId =
-            static_cast<uint16_t>(edid[kProductIdOffset] | (edid[kProductIdOffset + 1] << 8));
-
-    constexpr size_t kManufactureWeekOffset = 16;
-    if (edid.size() < kManufactureWeekOffset + sizeof(uint8_t)) {
-        ALOGE("Invalid EDID: manufacture week is truncated.");
-        return {};
-    }
-    const uint8_t manufactureWeek = edid[kManufactureWeekOffset];
-    ALOGW_IF(0x37 <= manufactureWeek && manufactureWeek <= 0xfe,
-             "Invalid EDID: week of manufacture cannot be in the range [0x37, 0xfe].");
-
-    constexpr size_t kManufactureYearOffset = 17;
-    if (edid.size() < kManufactureYearOffset + sizeof(uint8_t)) {
-        ALOGE("Invalid EDID: manufacture year is truncated.");
-        return {};
-    }
-    const uint8_t manufactureOrModelYear = edid[kManufactureYearOffset];
-    ALOGW_IF(manufactureOrModelYear <= 0xf,
-             "Invalid EDID: model year or manufacture year cannot be in the range [0x0, 0xf].");
-
-    constexpr size_t kDescriptorOffset = 54;
-    if (edid.size() < kDescriptorOffset) {
-        ALOGE("Invalid EDID: descriptors are missing.");
-        return {};
-    }
-
-    byte_view view(edid.data(), edid.size());
-    view.remove_prefix(kDescriptorOffset);
-
-    std::string_view displayName;
-    std::string_view serialNumber;
-    std::string_view asciiText;
-
-    constexpr size_t kDescriptorCount = 4;
-    constexpr size_t kDescriptorLength = 18;
-
-    for (size_t i = 0; i < kDescriptorCount; i++) {
-        if (view.size() < kDescriptorLength) {
-            break;
-        }
-
-        if (const auto type = getEdidDescriptorType(view)) {
-            byte_view descriptor(view.data(), kDescriptorLength);
-            descriptor.remove_prefix(kEdidHeaderLength);
-
-            switch (*type) {
-                case 0xfc:
-                    displayName = parseEdidText(descriptor);
-                    break;
-                case 0xfe:
-                    asciiText = parseEdidText(descriptor);
-                    break;
-                case 0xff:
-                    serialNumber = parseEdidText(descriptor);
-                    break;
-            }
-        }
-
-        view.remove_prefix(kDescriptorLength);
-    }
-
-    std::string_view modelString = displayName;
-
-    if (modelString.empty()) {
-        ALOGW("Invalid EDID: falling back to serial number due to missing display name.");
-        modelString = serialNumber;
-    }
-    if (modelString.empty()) {
-        ALOGW("Invalid EDID: falling back to ASCII text due to missing serial number.");
-        modelString = asciiText;
-    }
-    if (modelString.empty()) {
-        ALOGE("Invalid EDID: display name and fallback descriptors are missing.");
-        return {};
-    }
-
-    // Hash model string instead of using product code or (integer) serial number, since the latter
-    // have been observed to change on some displays with multiple inputs. Use a stable hash instead
-    // of std::hash which is only required to be same within a single execution of a program.
-    const uint32_t modelHash = static_cast<uint32_t>(cityHash64Len0To16(modelString));
-
-    // Parse extension blocks.
-    std::optional<Cea861ExtensionBlock> cea861Block;
-    if (edid.size() < kEdidBlockSize) {
-        ALOGW("Invalid EDID: block 0 is truncated.");
-    } else {
-        constexpr size_t kNumExtensionsOffset = 126;
-        const size_t numExtensions = edid[kNumExtensionsOffset];
-        view = byte_view(edid.data(), edid.size());
-        for (size_t blockNumber = 1; blockNumber <= numExtensions; blockNumber++) {
-            view.remove_prefix(kEdidBlockSize);
-            if (view.size() < kEdidBlockSize) {
-                ALOGW("Invalid EDID: block %zu is truncated.", blockNumber);
-                break;
-            }
-
-            const byte_view block(view.data(), kEdidBlockSize);
-            ALOGW_IF(std::accumulate(block.begin(), block.end(), static_cast<uint8_t>(0)),
-                     "Invalid EDID: block %zu does not checksum.", blockNumber);
-            const uint8_t tag = block[0];
-
-            constexpr uint8_t kCea861BlockTag = 0x2;
-            if (tag == kCea861BlockTag) {
-                cea861Block = parseCea861Block(block);
-            } else {
-                ALOGV("Ignoring block number %zu with tag %x.", blockNumber, tag);
-            }
-        }
-    }
-
-    return Edid{.manufacturerId = manufacturerId,
-                .productId = productId,
-                .pnpId = *pnpId,
-                .modelHash = modelHash,
-                .displayName = displayName,
-                .manufactureOrModelYear = manufactureOrModelYear,
-                .manufactureWeek = manufactureWeek,
-                .cea861Block = cea861Block};
-}
-
-std::optional<PnpId> getPnpId(uint16_t manufacturerId) {
-    const char a = getPnpLetter<0>(manufacturerId);
-    const char b = getPnpLetter<1>(manufacturerId);
-    const char c = getPnpLetter<2>(manufacturerId);
-    return a && b && c ? std::make_optional(PnpId{a, b, c}) : std::nullopt;
-}
-
-std::optional<PnpId> getPnpId(PhysicalDisplayId displayId) {
-    return getPnpId(displayId.getManufacturerId());
-}
-
-std::optional<DisplayIdentificationInfo> parseDisplayIdentificationData(
-        uint8_t port, const DisplayIdentificationData& data) {
-    if (!isEdid(data)) {
-        ALOGE("Display identification data has unknown format.");
-        return {};
-    }
-
-    const auto edid = parseEdid(data);
-    if (!edid) {
-        return {};
-    }
-
-    const auto displayId = PhysicalDisplayId::fromEdid(port, edid->manufacturerId, edid->modelHash);
-    return DisplayIdentificationInfo{.id = displayId,
-                                     .name = std::string(edid->displayName),
-                                     .deviceProductInfo = buildDeviceProductInfo(*edid)};
-}
-
-PhysicalDisplayId getVirtualDisplayId(uint32_t id) {
-    return PhysicalDisplayId::fromEdid(0, kVirtualEdidManufacturerId, id);
-}
-
-} // namespace android
-
diff --git a/services/surfaceflinger/DisplayHardware/DisplayIdentification.h b/services/surfaceflinger/DisplayHardware/DisplayIdentification.h
deleted file mode 100644
index fbea4e5..0000000
--- a/services/surfaceflinger/DisplayHardware/DisplayIdentification.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2018 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 <array>
-#include <cstdint>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <vector>
-
-#include <ui/DeviceProductInfo.h>
-#include <ui/DisplayId.h>
-
-#define LEGACY_DISPLAY_TYPE_PRIMARY 0
-#define LEGACY_DISPLAY_TYPE_EXTERNAL 1
-
-namespace android {
-
-
-using DisplayIdentificationData = std::vector<uint8_t>;
-
-struct DisplayIdentificationInfo {
-    PhysicalDisplayId id;
-    std::string name;
-    std::optional<DeviceProductInfo> deviceProductInfo;
-};
-
-struct ExtensionBlock {
-    uint8_t tag;
-    uint8_t revisionNumber;
-};
-
-struct HdmiPhysicalAddress {
-    // The address describes the path from the display sink in the network of connected HDMI
-    // devices. The format of the address is "a.b.c.d". For example, address 2.1.0.0 means we are
-    // connected to port 1 of a device which is connected to port 2 of the sink.
-    uint8_t a, b, c, d;
-};
-
-struct HdmiVendorDataBlock {
-    HdmiPhysicalAddress physicalAddress;
-};
-
-struct Cea861ExtensionBlock : ExtensionBlock {
-    std::optional<HdmiVendorDataBlock> hdmiVendorDataBlock;
-};
-
-struct Edid {
-    uint16_t manufacturerId;
-    uint16_t productId;
-    PnpId pnpId;
-    uint32_t modelHash;
-    std::string_view displayName;
-    uint8_t manufactureOrModelYear;
-    uint8_t manufactureWeek;
-    std::optional<Cea861ExtensionBlock> cea861Block;
-};
-
-bool isEdid(const DisplayIdentificationData&);
-std::optional<Edid> parseEdid(const DisplayIdentificationData&);
-std::optional<PnpId> getPnpId(uint16_t manufacturerId);
-std::optional<PnpId> getPnpId(PhysicalDisplayId);
-
-std::optional<DisplayIdentificationInfo> parseDisplayIdentificationData(
-        uint8_t port, const DisplayIdentificationData&);
-
-PhysicalDisplayId getVirtualDisplayId(uint32_t id);
-
-} // namespace android
-
diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.h b/services/surfaceflinger/DisplayHardware/FramebufferSurface.h
index 3123351..d41a856 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.h
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.h
@@ -26,7 +26,7 @@
 #include <ui/DisplayId.h>
 #include <ui/Size.h>
 
-#include "DisplayIdentification.h"
+#include <ui/DisplayIdentification.h>
 
 // ---------------------------------------------------------------------------
 namespace android {
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h
index 4fae06d..70bcce5 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.h
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.h
@@ -26,6 +26,7 @@
 #include <vector>
 
 #include <android-base/thread_annotations.h>
+#include <ui/DisplayIdentification.h>
 #include <ui/FenceTime.h>
 
 // TODO(b/129481165): remove the #pragma below and fix conversion issues
@@ -38,7 +39,6 @@
 #include <utils/StrongPointer.h>
 #include <utils/Timers.h>
 
-#include "DisplayIdentification.h"
 #include "DisplayMode.h"
 #include "HWC2.h"
 #include "Hal.h"
diff --git a/services/surfaceflinger/DisplayHardware/Hash.cpp b/services/surfaceflinger/DisplayHardware/Hash.cpp
deleted file mode 100644
index 6056c8d..0000000
--- a/services/surfaceflinger/DisplayHardware/Hash.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-#undef LOG_TAG
-#define LOG_TAG "DisplayIdentification"
-
-#include <cstring>
-#include <type_traits>
-
-#include <log/log.h>
-
-#include "Hash.h"
-
-namespace android {
-namespace {
-
-template <class T>
-inline T load(const void* p) {
-    static_assert(std::is_integral<T>::value, "T must be integral");
-
-    T r;
-    std::memcpy(&r, p, sizeof(r));
-    return r;
-}
-
-uint64_t rotateByAtLeast1(uint64_t val, uint8_t shift) {
-    return (val >> shift) | (val << (64 - shift));
-}
-
-uint64_t shiftMix(uint64_t val) {
-    return val ^ (val >> 47);
-}
-
-uint64_t hash64Len16(uint64_t u, uint64_t v) {
-    constexpr uint64_t kMul = 0x9ddfea08eb382d69;
-    uint64_t a = (u ^ v) * kMul;
-    a ^= (a >> 47);
-    uint64_t b = (v ^ a) * kMul;
-    b ^= (b >> 47);
-    b *= kMul;
-    return b;
-}
-
-uint64_t hash64Len0To16(const char* s, uint64_t len) {
-    constexpr uint64_t k2 = 0x9ae16a3b2f90404f;
-    constexpr uint64_t k3 = 0xc949d7c7509e6557;
-
-    if (len > 8) {
-        const uint64_t a = load<uint64_t>(s);
-        const uint64_t b = load<uint64_t>(s + len - 8);
-        return hash64Len16(a, rotateByAtLeast1(b + len, static_cast<uint8_t>(len))) ^ b;
-    }
-    if (len >= 4) {
-        const uint32_t a = load<uint32_t>(s);
-        const uint32_t b = load<uint32_t>(s + len - 4);
-        return hash64Len16(len + (a << 3), b);
-    }
-    if (len > 0) {
-        const unsigned char a = static_cast<unsigned char>(s[0]);
-        const unsigned char b = static_cast<unsigned char>(s[len >> 1]);
-        const unsigned char c = static_cast<unsigned char>(s[len - 1]);
-        const uint32_t y = static_cast<uint32_t>(a) + (static_cast<uint32_t>(b) << 8);
-        const uint32_t z = static_cast<uint32_t>(len) + (static_cast<uint32_t>(c) << 2);
-        return shiftMix(y * k2 ^ z * k3) * k2;
-    }
-    return k2;
-}
-
-} // namespace
-
-uint64_t cityHash64Len0To16(std::string_view sv) {
-    auto len = sv.length();
-    if (len > 16) {
-        ALOGE("%s called with length %zu. Only hashing the first 16 chars", __FUNCTION__, len);
-        len = 16;
-    }
-    return hash64Len0To16(sv.data(), len);
-}
-
-} // namespace android
\ No newline at end of file
diff --git a/services/surfaceflinger/DisplayHardware/Hash.h b/services/surfaceflinger/DisplayHardware/Hash.h
deleted file mode 100644
index a7b6c71..0000000
--- a/services/surfaceflinger/DisplayHardware/Hash.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2021 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>
-#include <string_view>
-
-namespace android {
-
-// CityHash64 implementation that only hashes at most the first 16 characters of the given string.
-uint64_t cityHash64Len0To16(std::string_view sv);
-
-} // namespace android
\ No newline at end of file
diff --git a/services/surfaceflinger/DisplayHardware/PowerAdvisor.h b/services/surfaceflinger/DisplayHardware/PowerAdvisor.h
index 28d28f4..0db56aa 100644
--- a/services/surfaceflinger/DisplayHardware/PowerAdvisor.h
+++ b/services/surfaceflinger/DisplayHardware/PowerAdvisor.h
@@ -22,8 +22,8 @@
 
 #include <utils/Mutex.h>
 
+#include <ui/DisplayIdentification.h>
 #include "../Scheduler/OneShotTimer.h"
-#include "DisplayIdentification.h"
 
 using namespace std::chrono_literals;
 
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
index 7720713..307da41 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
@@ -25,7 +25,7 @@
 #include <gui/IGraphicBufferProducer.h>
 #include <ui/DisplayId.h>
 
-#include "DisplayIdentification.h"
+#include <ui/DisplayIdentification.h>
 
 namespace android {
 
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 64a18c6..e8bc127 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -94,6 +94,7 @@
 #include <type_traits>
 #include <unordered_map>
 
+#include <ui/DisplayIdentification.h>
 #include "BackgroundExecutor.h"
 #include "BufferLayer.h"
 #include "BufferQueueLayer.h"
@@ -103,7 +104,6 @@
 #include "ContainerLayer.h"
 #include "DisplayDevice.h"
 #include "DisplayHardware/ComposerHal.h"
-#include "DisplayHardware/DisplayIdentification.h"
 #include "DisplayHardware/FramebufferSurface.h"
 #include "DisplayHardware/HWComposer.h"
 #include "DisplayHardware/Hal.h"
diff --git a/services/surfaceflinger/tests/unittests/Android.bp b/services/surfaceflinger/tests/unittests/Android.bp
index bba880e..6f72387 100644
--- a/services/surfaceflinger/tests/unittests/Android.bp
+++ b/services/surfaceflinger/tests/unittests/Android.bp
@@ -50,7 +50,6 @@
         "CachingTest.cpp",
         "CompositionTest.cpp",
         "DispSyncSourceTest.cpp",
-        "DisplayIdentificationTest.cpp",
         "DisplayIdGeneratorTest.cpp",
         "DisplayTransactionTest.cpp",
         "DisplayDevice_GetBestColorModeTest.cpp",
diff --git a/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp b/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp
deleted file mode 100644
index cd4a5c9..0000000
--- a/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-
-// TODO(b/129481165): remove the #pragma below and fix conversion issues
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wextra"
-
-#include <functional>
-#include <string_view>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "DisplayHardware/DisplayIdentification.h"
-#include "DisplayHardware/Hash.h"
-
-using ::testing::ElementsAre;
-
-namespace android {
-namespace {
-
-const unsigned char kInternalEdid[] =
-        "\x00\xff\xff\xff\xff\xff\xff\x00\x4c\xa3\x42\x31\x00\x00\x00\x00"
-        "\x00\x15\x01\x03\x80\x1a\x10\x78\x0a\xd3\xe5\x95\x5c\x60\x90\x27"
-        "\x19\x50\x54\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
-        "\x01\x01\x01\x01\x01\x01\x9e\x1b\x00\xa0\x50\x20\x12\x30\x10\x30"
-        "\x13\x00\x05\xa3\x10\x00\x00\x19\x00\x00\x00\x0f\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x23\x87\x02\x64\x00\x00\x00\x00\xfe\x00\x53"
-        "\x41\x4d\x53\x55\x4e\x47\x0a\x20\x20\x20\x20\x20\x00\x00\x00\xfe"
-        "\x00\x31\x32\x31\x41\x54\x31\x31\x2d\x38\x30\x31\x0a\x20\x00\x45";
-
-const unsigned char kExternalEdid[] =
-        "\x00\xff\xff\xff\xff\xff\xff\x00\x22\xf0\x6c\x28\x01\x01\x01\x01"
-        "\x02\x16\x01\x04\xb5\x40\x28\x78\xe2\x8d\x85\xad\x4f\x35\xb1\x25"
-        "\x0e\x50\x54\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
-        "\x01\x01\x01\x01\x01\x01\xe2\x68\x00\xa0\xa0\x40\x2e\x60\x30\x20"
-        "\x36\x00\x81\x90\x21\x00\x00\x1a\xbc\x1b\x00\xa0\x50\x20\x17\x30"
-        "\x30\x20\x36\x00\x81\x90\x21\x00\x00\x1a\x00\x00\x00\xfc\x00\x48"
-        "\x50\x20\x5a\x52\x33\x30\x77\x0a\x20\x20\x20\x20\x00\x00\x00\xff"
-        "\x00\x43\x4e\x34\x32\x30\x32\x31\x33\x37\x51\x0a\x20\x20\x00\x71";
-
-// Extended EDID with timing extension.
-const unsigned char kExternalEedid[] =
-        "\x00\xff\xff\xff\xff\xff\xff\x00\x4c\x2d\xfe\x08\x00\x00\x00\x00"
-        "\x29\x15\x01\x03\x80\x10\x09\x78\x0a\xee\x91\xa3\x54\x4c\x99\x26"
-        "\x0f\x50\x54\xbd\xef\x80\x71\x4f\x81\xc0\x81\x00\x81\x80\x95\x00"
-        "\xa9\xc0\xb3\x00\x01\x01\x02\x3a\x80\x18\x71\x38\x2d\x40\x58\x2c"
-        "\x45\x00\xa0\x5a\x00\x00\x00\x1e\x66\x21\x56\xaa\x51\x00\x1e\x30"
-        "\x46\x8f\x33\x00\xa0\x5a\x00\x00\x00\x1e\x00\x00\x00\xfd\x00\x18"
-        "\x4b\x0f\x51\x17\x00\x0a\x20\x20\x20\x20\x20\x20\x00\x00\x00\xfc"
-        "\x00\x53\x41\x4d\x53\x55\x4e\x47\x0a\x20\x20\x20\x20\x20\x01\x1d"
-        "\x02\x03\x1f\xf1\x47\x90\x04\x05\x03\x20\x22\x07\x23\x09\x07\x07"
-        "\x83\x01\x00\x00\xe2\x00\x0f\x67\x03\x0c\x00\x20\x00\xb8\x2d\x01"
-        "\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\xa0\x5a\x00\x00\x00"
-        "\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\xa0\x5a\x00"
-        "\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\xa0"
-        "\x5a\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc6";
-
-const unsigned char kPanasonicTvEdid[] =
-        "\x00\xff\xff\xff\xff\xff\xff\x00\x34\xa9\x96\xa2\x01\x01\x01"
-        "\x01\x00\x1d\x01\x03\x80\x80\x48\x78\x0a\xda\xff\xa3\x58\x4a"
-        "\xa2\x29\x17\x49\x4b\x20\x08\x00\x31\x40\x61\x40\x01\x01\x01"
-        "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x08\xe8\x00\x30\xf2\x70"
-        "\x5a\x80\xb0\x58\x8a\x00\xba\x88\x21\x00\x00\x1e\x02\x3a\x80"
-        "\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\xba\x88\x21\x00\x00\x1e"
-        "\x00\x00\x00\xfc\x00\x50\x61\x6e\x61\x73\x6f\x6e\x69\x63\x2d"
-        "\x54\x56\x0a\x00\x00\x00\xfd\x00\x17\x3d\x0f\x88\x3c\x00\x0a"
-        "\x20\x20\x20\x20\x20\x20\x01\x1d\x02\x03\x6b\xf0\x57\x61\x60"
-        "\x10\x1f\x66\x65\x05\x14\x20\x21\x22\x04\x13\x03\x12\x07\x16"
-        "\x5d\x5e\x5f\x62\x63\x64\x2c\x0d\x07\x01\x15\x07\x50\x57\x07"
-        "\x01\x67\x04\x03\x83\x0f\x00\x00\x6e\x03\x0c\x00\x20\x00\x38"
-        "\x3c\x2f\x08\x80\x01\x02\x03\x04\x67\xd8\x5d\xc4\x01\x78\x80"
-        "\x03\xe2\x00\x4b\xe3\x05\xff\x01\xe2\x0f\x33\xe3\x06\x0f\x01"
-        "\xe5\x01\x8b\x84\x90\x01\xeb\x01\x46\xd0\x00\x44\x03\x70\x80"
-        "\x5e\x75\x94\xe6\x11\x46\xd0\x00\x70\x00\x66\x21\x56\xaa\x51"
-        "\x00\x1e\x30\x46\x8f\x33\x00\xba\x88\x21\x00\x00\x1e\x00\x00"
-        "\xc8";
-
-const unsigned char kHisenseTvEdid[] =
-        "\x00\xff\xff\xff\xff\xff\xff\x00\x20\xa3\x00\x00\x00\x00\x00"
-        "\x00\x12\x1d\x01\x03\x80\x00\x00\x78\x0a\xd7\xa5\xa2\x59\x4a"
-        "\x96\x24\x14\x50\x54\xa3\x08\x00\xd1\xc0\xb3\x00\x81\x00\x81"
-        "\x80\x81\x40\x81\xc0\x01\x01\x01\x01\x02\x3a\x80\x18\x71\x38"
-        "\x2d\x40\x58\x2c\x45\x00\x3f\x43\x21\x00\x00\x1a\x02\x3a\x80"
-        "\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\x3f\x43\x21\x00\x00\x1a"
-        "\x00\x00\x00\xfd\x00\x1e\x4c\x1e\x5a\x1e\x00\x0a\x20\x20\x20"
-        "\x20\x20\x20\x00\x00\x00\xfc\x00\x48\x69\x73\x65\x6e\x73\x65"
-        "\x0a\x20\x20\x20\x20\x20\x01\x47\x02\x03\x2d\x71\x50\x90\x05"
-        "\x04\x03\x07\x02\x06\x01\x1f\x14\x13\x12\x16\x11\x15\x20\x2c"
-        "\x09\x07\x03\x15\x07\x50\x57\x07\x00\x39\x07\xbb\x66\x03\x0c"
-        "\x00\x12\x34\x00\x83\x01\x00\x00\x01\x1d\x00\x72\x51\xd0\x1e"
-        "\x20\x6e\x28\x55\x00\xc4\x8e\x21\x00\x00\x1e\x01\x1d\x80\x18"
-        "\x71\x1c\x16\x20\x58\x2c\x25\x00\xc4\x8e\x21\x00\x00\x9e\x8c"
-        "\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\x13\x8e\x21\x00"
-        "\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x07";
-
-const unsigned char kCtlDisplayEdid[] =
-        "\x00\xff\xff\xff\xff\xff\xff\x00\x0e\x8c\x9d\x24\x00\x00\x00\x00"
-        "\xff\x17\x01\x04\xa5\x34\x1d\x78\x3a\xa7\x25\xa4\x57\x51\xa0\x26"
-        "\x10\x50\x54\xbf\xef\x80\xb3\x00\xa9\x40\x95\x00\x81\x40\x81\x80"
-        "\x95\x0f\x71\x4f\x90\x40\x02\x3a\x80\x18\x71\x38\x2d\x40\x58\x2c"
-        "\x45\x00\x09\x25\x21\x00\x00\x1e\x66\x21\x50\xb0\x51\x00\x1b\x30"
-        "\x40\x70\x36\x00\x09\x25\x21\x00\x00\x1e\x00\x00\x00\xfd\x00\x31"
-        "\x4c\x1e\x52\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xfc"
-        "\x00\x4c\x50\x32\x33\x36\x31\x0a\x20\x20\x20\x20\x20\x20\x01\x3e"
-        "\x02\x03\x22\xf2\x4f\x90\x9f\x05\x14\x04\x13\x03\x02\x12\x11\x07"
-        "\x06\x16\x15\x01\x23\x09\x07\x07\x83\x01\x00\x00\x65\xb9\x14\x00"
-        "\x04\x00\x02\x3a\x80\x18\x71\x38\x2d\x40\x58\x2c\x45\x00\x09\x25"
-        "\x21\x00\x00\x1e\x02\x3a\x80\xd0\x72\x38\x2d\x40\x10\x2c\x45\x80"
-        "\x09\x25\x21\x00\x00\x1e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28"
-        "\x55\x00\x09\x25\x21\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10"
-        "\x10\x3e\x96\x00\x09\x25\x21\x00\x00\x18\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf4";
-
-template <size_t N>
-DisplayIdentificationData asDisplayIdentificationData(const unsigned char (&bytes)[N]) {
-    return DisplayIdentificationData(bytes, bytes + N - 1);
-}
-
-uint32_t hash(const char* str) {
-    return static_cast<uint32_t>(cityHash64Len0To16(str));
-}
-
-} // namespace
-
-const DisplayIdentificationData& getInternalEdid() {
-    static const DisplayIdentificationData data = asDisplayIdentificationData(kInternalEdid);
-    return data;
-}
-
-const DisplayIdentificationData& getExternalEdid() {
-    static const DisplayIdentificationData data = asDisplayIdentificationData(kExternalEdid);
-    return data;
-}
-
-const DisplayIdentificationData& getExternalEedid() {
-    static const DisplayIdentificationData data = asDisplayIdentificationData(kExternalEedid);
-    return data;
-}
-
-const DisplayIdentificationData& getPanasonicTvEdid() {
-    static const DisplayIdentificationData data = asDisplayIdentificationData(kPanasonicTvEdid);
-    return data;
-}
-
-const DisplayIdentificationData& getHisenseTvEdid() {
-    static const DisplayIdentificationData data = asDisplayIdentificationData(kHisenseTvEdid);
-    return data;
-}
-
-const DisplayIdentificationData& getCtlDisplayEdid() {
-    static const DisplayIdentificationData data = asDisplayIdentificationData(kCtlDisplayEdid);
-    return data;
-}
-
-TEST(DisplayIdentificationTest, isEdid) {
-    EXPECT_FALSE(isEdid({}));
-
-    EXPECT_TRUE(isEdid(getInternalEdid()));
-    EXPECT_TRUE(isEdid(getExternalEdid()));
-    EXPECT_TRUE(isEdid(getExternalEedid()));
-    EXPECT_TRUE(isEdid(getPanasonicTvEdid()));
-    EXPECT_TRUE(isEdid(getHisenseTvEdid()));
-    EXPECT_TRUE(isEdid(getCtlDisplayEdid()));
-}
-
-TEST(DisplayIdentificationTest, parseEdid) {
-    auto edid = parseEdid(getInternalEdid());
-    ASSERT_TRUE(edid);
-    EXPECT_EQ(0x4ca3u, edid->manufacturerId);
-    EXPECT_STREQ("SEC", edid->pnpId.data());
-    // ASCII text should be used as fallback if display name and serial number are missing.
-    EXPECT_EQ(hash("121AT11-801"), edid->modelHash);
-    EXPECT_TRUE(edid->displayName.empty());
-    EXPECT_EQ(12610, edid->productId);
-    EXPECT_EQ(21, edid->manufactureOrModelYear);
-    EXPECT_EQ(0, edid->manufactureWeek);
-    EXPECT_FALSE(edid->cea861Block);
-
-    edid = parseEdid(getExternalEdid());
-    ASSERT_TRUE(edid);
-    EXPECT_EQ(0x22f0u, edid->manufacturerId);
-    EXPECT_STREQ("HWP", edid->pnpId.data());
-    EXPECT_EQ(hash("HP ZR30w"), edid->modelHash);
-    EXPECT_EQ("HP ZR30w", edid->displayName);
-    EXPECT_EQ(10348, edid->productId);
-    EXPECT_EQ(22, edid->manufactureOrModelYear);
-    EXPECT_EQ(2, edid->manufactureWeek);
-    EXPECT_FALSE(edid->cea861Block);
-
-    edid = parseEdid(getExternalEedid());
-    ASSERT_TRUE(edid);
-    EXPECT_EQ(0x4c2du, edid->manufacturerId);
-    EXPECT_STREQ("SAM", edid->pnpId.data());
-    EXPECT_EQ(hash("SAMSUNG"), edid->modelHash);
-    EXPECT_EQ("SAMSUNG", edid->displayName);
-    EXPECT_EQ(2302, edid->productId);
-    EXPECT_EQ(21, edid->manufactureOrModelYear);
-    EXPECT_EQ(41, edid->manufactureWeek);
-    ASSERT_TRUE(edid->cea861Block);
-    ASSERT_TRUE(edid->cea861Block->hdmiVendorDataBlock);
-    auto physicalAddress = edid->cea861Block->hdmiVendorDataBlock->physicalAddress;
-    EXPECT_EQ(2, physicalAddress.a);
-    EXPECT_EQ(0, physicalAddress.b);
-    EXPECT_EQ(0, physicalAddress.c);
-    EXPECT_EQ(0, physicalAddress.d);
-
-    edid = parseEdid(getPanasonicTvEdid());
-    ASSERT_TRUE(edid);
-    EXPECT_EQ(13481, edid->manufacturerId);
-    EXPECT_STREQ("MEI", edid->pnpId.data());
-    EXPECT_EQ(hash("Panasonic-TV"), edid->modelHash);
-    EXPECT_EQ("Panasonic-TV", edid->displayName);
-    EXPECT_EQ(41622, edid->productId);
-    EXPECT_EQ(29, edid->manufactureOrModelYear);
-    EXPECT_EQ(0, edid->manufactureWeek);
-    ASSERT_TRUE(edid->cea861Block);
-    ASSERT_TRUE(edid->cea861Block->hdmiVendorDataBlock);
-    physicalAddress = edid->cea861Block->hdmiVendorDataBlock->physicalAddress;
-    EXPECT_EQ(2, physicalAddress.a);
-    EXPECT_EQ(0, physicalAddress.b);
-    EXPECT_EQ(0, physicalAddress.c);
-    EXPECT_EQ(0, physicalAddress.d);
-
-    edid = parseEdid(getHisenseTvEdid());
-    ASSERT_TRUE(edid);
-    EXPECT_EQ(8355, edid->manufacturerId);
-    EXPECT_STREQ("HEC", edid->pnpId.data());
-    EXPECT_EQ(hash("Hisense"), edid->modelHash);
-    EXPECT_EQ("Hisense", edid->displayName);
-    EXPECT_EQ(0, edid->productId);
-    EXPECT_EQ(29, edid->manufactureOrModelYear);
-    EXPECT_EQ(18, edid->manufactureWeek);
-    ASSERT_TRUE(edid->cea861Block);
-    ASSERT_TRUE(edid->cea861Block->hdmiVendorDataBlock);
-    physicalAddress = edid->cea861Block->hdmiVendorDataBlock->physicalAddress;
-    EXPECT_EQ(1, physicalAddress.a);
-    EXPECT_EQ(2, physicalAddress.b);
-    EXPECT_EQ(3, physicalAddress.c);
-    EXPECT_EQ(4, physicalAddress.d);
-
-    edid = parseEdid(getCtlDisplayEdid());
-    ASSERT_TRUE(edid);
-    EXPECT_EQ(3724, edid->manufacturerId);
-    EXPECT_STREQ("CTL", edid->pnpId.data());
-    EXPECT_EQ(hash("LP2361"), edid->modelHash);
-    EXPECT_EQ("LP2361", edid->displayName);
-    EXPECT_EQ(9373, edid->productId);
-    EXPECT_EQ(23, edid->manufactureOrModelYear);
-    EXPECT_EQ(0xff, edid->manufactureWeek);
-    ASSERT_TRUE(edid->cea861Block);
-    EXPECT_FALSE(edid->cea861Block->hdmiVendorDataBlock);
-}
-
-TEST(DisplayIdentificationTest, parseInvalidEdid) {
-    EXPECT_FALSE(isEdid({}));
-    EXPECT_FALSE(parseEdid({}));
-
-    // Display name must be printable.
-    auto data = getExternalEdid();
-    data[97] = '\x1b';
-    auto edid = parseEdid(data);
-    ASSERT_TRUE(edid);
-    // Serial number should be used as fallback if display name is invalid.
-    const auto modelHash = hash("CN4202137Q");
-    EXPECT_EQ(modelHash, edid->modelHash);
-    EXPECT_TRUE(edid->displayName.empty());
-
-    // Parsing should succeed even if EDID is truncated.
-    data.pop_back();
-    edid = parseEdid(data);
-    ASSERT_TRUE(edid);
-    EXPECT_EQ(modelHash, edid->modelHash);
-}
-
-TEST(DisplayIdentificationTest, getPnpId) {
-    EXPECT_FALSE(getPnpId(0));
-    EXPECT_FALSE(getPnpId(static_cast<uint16_t>(-1)));
-
-    EXPECT_STREQ("SEC", getPnpId(0x4ca3u).value_or(PnpId{}).data());
-    EXPECT_STREQ("HWP", getPnpId(0x22f0u).value_or(PnpId{}).data());
-    EXPECT_STREQ("SAM", getPnpId(0x4c2du).value_or(PnpId{}).data());
-}
-
-TEST(DisplayIdentificationTest, parseDisplayIdentificationData) {
-    const auto primaryInfo = parseDisplayIdentificationData(0, getInternalEdid());
-    ASSERT_TRUE(primaryInfo);
-
-    const auto secondaryInfo = parseDisplayIdentificationData(1, getExternalEdid());
-    ASSERT_TRUE(secondaryInfo);
-
-    const auto tertiaryInfo = parseDisplayIdentificationData(2, getExternalEedid());
-    ASSERT_TRUE(tertiaryInfo);
-
-    // Display IDs should be unique.
-    EXPECT_EQ(4633257497453176576, primaryInfo->id.value);
-    EXPECT_EQ(4621520285560261121, secondaryInfo->id.value);
-    EXPECT_EQ(4633127902230889474, tertiaryInfo->id.value);
-}
-
-TEST(DisplayIdentificationTest, deviceProductInfo) {
-    using ManufactureYear = DeviceProductInfo::ManufactureYear;
-    using ManufactureWeekAndYear = DeviceProductInfo::ManufactureWeekAndYear;
-    using ModelYear = DeviceProductInfo::ModelYear;
-
-    {
-        const auto displayIdInfo = parseDisplayIdentificationData(0, getInternalEdid());
-        ASSERT_TRUE(displayIdInfo);
-        ASSERT_TRUE(displayIdInfo->deviceProductInfo);
-        const auto& info = *displayIdInfo->deviceProductInfo;
-        EXPECT_EQ("", info.name);
-        EXPECT_STREQ("SEC", info.manufacturerPnpId.data());
-        EXPECT_EQ("12610", info.productId);
-        ASSERT_TRUE(std::holds_alternative<ManufactureYear>(info.manufactureOrModelDate));
-        EXPECT_EQ(2011, std::get<ManufactureYear>(info.manufactureOrModelDate).year);
-        EXPECT_TRUE(info.relativeAddress.empty());
-    }
-    {
-        const auto displayIdInfo = parseDisplayIdentificationData(0, getExternalEdid());
-        ASSERT_TRUE(displayIdInfo);
-        ASSERT_TRUE(displayIdInfo->deviceProductInfo);
-        const auto& info = *displayIdInfo->deviceProductInfo;
-        EXPECT_EQ("HP ZR30w", info.name);
-        EXPECT_STREQ("HWP", info.manufacturerPnpId.data());
-        EXPECT_EQ("10348", info.productId);
-        ASSERT_TRUE(std::holds_alternative<ManufactureWeekAndYear>(info.manufactureOrModelDate));
-        const auto& date = std::get<ManufactureWeekAndYear>(info.manufactureOrModelDate);
-        EXPECT_EQ(2012, date.year);
-        EXPECT_EQ(2, date.week);
-        EXPECT_TRUE(info.relativeAddress.empty());
-    }
-    {
-        const auto displayIdInfo = parseDisplayIdentificationData(0, getExternalEedid());
-        ASSERT_TRUE(displayIdInfo);
-        ASSERT_TRUE(displayIdInfo->deviceProductInfo);
-        const auto& info = *displayIdInfo->deviceProductInfo;
-        EXPECT_EQ("SAMSUNG", info.name);
-        EXPECT_STREQ("SAM", info.manufacturerPnpId.data());
-        EXPECT_EQ("2302", info.productId);
-        ASSERT_TRUE(std::holds_alternative<ManufactureWeekAndYear>(info.manufactureOrModelDate));
-        const auto& date = std::get<ManufactureWeekAndYear>(info.manufactureOrModelDate);
-        EXPECT_EQ(2011, date.year);
-        EXPECT_EQ(41, date.week);
-        EXPECT_THAT(info.relativeAddress, ElementsAre(2, 0, 0, 0));
-    }
-    {
-        const auto displayIdInfo = parseDisplayIdentificationData(0, getPanasonicTvEdid());
-        ASSERT_TRUE(displayIdInfo);
-        ASSERT_TRUE(displayIdInfo->deviceProductInfo);
-        const auto& info = *displayIdInfo->deviceProductInfo;
-        EXPECT_EQ("Panasonic-TV", info.name);
-        EXPECT_STREQ("MEI", info.manufacturerPnpId.data());
-        EXPECT_EQ("41622", info.productId);
-        ASSERT_TRUE(std::holds_alternative<ManufactureYear>(info.manufactureOrModelDate));
-        const auto& date = std::get<ManufactureYear>(info.manufactureOrModelDate);
-        EXPECT_EQ(2019, date.year);
-        EXPECT_THAT(info.relativeAddress, ElementsAre(2, 0, 0, 0));
-    }
-    {
-        const auto displayIdInfo = parseDisplayIdentificationData(0, getHisenseTvEdid());
-        ASSERT_TRUE(displayIdInfo);
-        ASSERT_TRUE(displayIdInfo->deviceProductInfo);
-        const auto& info = *displayIdInfo->deviceProductInfo;
-        EXPECT_EQ("Hisense", info.name);
-        EXPECT_STREQ("HEC", info.manufacturerPnpId.data());
-        EXPECT_EQ("0", info.productId);
-        ASSERT_TRUE(std::holds_alternative<ManufactureWeekAndYear>(info.manufactureOrModelDate));
-        const auto& date = std::get<ManufactureWeekAndYear>(info.manufactureOrModelDate);
-        EXPECT_EQ(2019, date.year);
-        EXPECT_EQ(18, date.week);
-        EXPECT_THAT(info.relativeAddress, ElementsAre(1, 2, 3, 4));
-    }
-    {
-        const auto displayIdInfo = parseDisplayIdentificationData(0, getCtlDisplayEdid());
-        ASSERT_TRUE(displayIdInfo);
-        ASSERT_TRUE(displayIdInfo->deviceProductInfo);
-        const auto& info = *displayIdInfo->deviceProductInfo;
-        EXPECT_EQ("LP2361", info.name);
-        EXPECT_STREQ("CTL", info.manufacturerPnpId.data());
-        EXPECT_EQ("9373", info.productId);
-        ASSERT_TRUE(std::holds_alternative<ModelYear>(info.manufactureOrModelDate));
-        EXPECT_EQ(2013, std::get<ModelYear>(info.manufactureOrModelDate).year);
-        EXPECT_TRUE(info.relativeAddress.empty());
-    }
-}
-
-TEST(DisplayIdentificationTest, fromPort) {
-    // Manufacturer ID should be invalid.
-    ASSERT_FALSE(getPnpId(PhysicalDisplayId::fromPort(0)));
-    ASSERT_FALSE(getPnpId(PhysicalDisplayId::fromPort(0xffu)));
-}
-
-TEST(DisplayIdentificationTest, getVirtualDisplayId) {
-    // Manufacturer ID should be invalid.
-    ASSERT_FALSE(getPnpId(getVirtualDisplayId(0)));
-    ASSERT_FALSE(getPnpId(getVirtualDisplayId(0xffff'ffffu)));
-}
-
-} // namespace android
-
-// TODO(b/129481165): remove the #pragma below and fix conversion issues
-#pragma clang diagnostic pop // ignored "-Wextra"
\ No newline at end of file
diff --git a/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.h b/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.h
deleted file mode 100644
index 1c8e5cc..0000000
--- a/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2018 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 "DisplayHardware/DisplayIdentification.h"
-
-namespace android {
-
-const DisplayIdentificationData& getInternalEdid();
-const DisplayIdentificationData& getExternalEdid();
-const DisplayIdentificationData& getExternalEedid();
-
-} // namespace android
diff --git a/services/surfaceflinger/tests/unittests/DisplayIdentificationTestHelpers.h b/services/surfaceflinger/tests/unittests/DisplayIdentificationTestHelpers.h
new file mode 100644
index 0000000..975bc12
--- /dev/null
+++ b/services/surfaceflinger/tests/unittests/DisplayIdentificationTestHelpers.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2022 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 <ui/DisplayIdentification.h>
+
+namespace android {
+
+template <size_t N>
+DisplayIdentificationData asDisplayIdentificationData(const unsigned char (&bytes)[N]) {
+    return DisplayIdentificationData(bytes, bytes + N - 1);
+}
+
+inline const DisplayIdentificationData& getInternalEdid() {
+    static constexpr unsigned char kInternalEdid[] =
+            "\x00\xff\xff\xff\xff\xff\xff\x00\x4c\xa3\x42\x31\x00\x00\x00\x00"
+            "\x00\x15\x01\x03\x80\x1a\x10\x78\x0a\xd3\xe5\x95\x5c\x60\x90\x27"
+            "\x19\x50\x54\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
+            "\x01\x01\x01\x01\x01\x01\x9e\x1b\x00\xa0\x50\x20\x12\x30\x10\x30"
+            "\x13\x00\x05\xa3\x10\x00\x00\x19\x00\x00\x00\x0f\x00\x00\x00\x00"
+            "\x00\x00\x00\x00\x00\x23\x87\x02\x64\x00\x00\x00\x00\xfe\x00\x53"
+            "\x41\x4d\x53\x55\x4e\x47\x0a\x20\x20\x20\x20\x20\x00\x00\x00\xfe"
+            "\x00\x31\x32\x31\x41\x54\x31\x31\x2d\x38\x30\x31\x0a\x20\x00\x45";
+    static const DisplayIdentificationData data = asDisplayIdentificationData(kInternalEdid);
+    return data;
+}
+
+inline const DisplayIdentificationData& getExternalEdid() {
+    static constexpr unsigned char kExternalEdid[] =
+            "\x00\xff\xff\xff\xff\xff\xff\x00\x22\xf0\x6c\x28\x01\x01\x01\x01"
+            "\x02\x16\x01\x04\xb5\x40\x28\x78\xe2\x8d\x85\xad\x4f\x35\xb1\x25"
+            "\x0e\x50\x54\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
+            "\x01\x01\x01\x01\x01\x01\xe2\x68\x00\xa0\xa0\x40\x2e\x60\x30\x20"
+            "\x36\x00\x81\x90\x21\x00\x00\x1a\xbc\x1b\x00\xa0\x50\x20\x17\x30"
+            "\x30\x20\x36\x00\x81\x90\x21\x00\x00\x1a\x00\x00\x00\xfc\x00\x48"
+            "\x50\x20\x5a\x52\x33\x30\x77\x0a\x20\x20\x20\x20\x00\x00\x00\xff"
+            "\x00\x43\x4e\x34\x32\x30\x32\x31\x33\x37\x51\x0a\x20\x20\x00\x71";
+    static const DisplayIdentificationData data = asDisplayIdentificationData(kExternalEdid);
+    return data;
+}
+
+inline const DisplayIdentificationData& getExternalEedid() {
+    // Extended EDID with timing extension.
+    static constexpr unsigned char kExternalEedid[] =
+            "\x00\xff\xff\xff\xff\xff\xff\x00\x4c\x2d\xfe\x08\x00\x00\x00\x00"
+            "\x29\x15\x01\x03\x80\x10\x09\x78\x0a\xee\x91\xa3\x54\x4c\x99\x26"
+            "\x0f\x50\x54\xbd\xef\x80\x71\x4f\x81\xc0\x81\x00\x81\x80\x95\x00"
+            "\xa9\xc0\xb3\x00\x01\x01\x02\x3a\x80\x18\x71\x38\x2d\x40\x58\x2c"
+            "\x45\x00\xa0\x5a\x00\x00\x00\x1e\x66\x21\x56\xaa\x51\x00\x1e\x30"
+            "\x46\x8f\x33\x00\xa0\x5a\x00\x00\x00\x1e\x00\x00\x00\xfd\x00\x18"
+            "\x4b\x0f\x51\x17\x00\x0a\x20\x20\x20\x20\x20\x20\x00\x00\x00\xfc"
+            "\x00\x53\x41\x4d\x53\x55\x4e\x47\x0a\x20\x20\x20\x20\x20\x01\x1d"
+            "\x02\x03\x1f\xf1\x47\x90\x04\x05\x03\x20\x22\x07\x23\x09\x07\x07"
+            "\x83\x01\x00\x00\xe2\x00\x0f\x67\x03\x0c\x00\x20\x00\xb8\x2d\x01"
+            "\x1d\x80\x18\x71\x1c\x16\x20\x58\x2c\x25\x00\xa0\x5a\x00\x00\x00"
+            "\x9e\x01\x1d\x00\x72\x51\xd0\x1e\x20\x6e\x28\x55\x00\xa0\x5a\x00"
+            "\x00\x00\x1e\x8c\x0a\xd0\x8a\x20\xe0\x2d\x10\x10\x3e\x96\x00\xa0"
+            "\x5a\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+            "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+            "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc6";
+    static const DisplayIdentificationData data = asDisplayIdentificationData(kExternalEedid);
+    return data;
+}
+
+} // namespace android
\ No newline at end of file
diff --git a/services/surfaceflinger/tests/unittests/DisplayTransactionTestHelpers.h b/services/surfaceflinger/tests/unittests/DisplayTransactionTestHelpers.h
index 69ac26e..8fdbd99 100644
--- a/services/surfaceflinger/tests/unittests/DisplayTransactionTestHelpers.h
+++ b/services/surfaceflinger/tests/unittests/DisplayTransactionTestHelpers.h
@@ -22,7 +22,7 @@
 #pragma clang diagnostic ignored "-Wextra"
 
 #include <type_traits>
-#include "DisplayIdentificationTest.h"
+#include "DisplayIdentificationTestHelpers.h"
 
 #include <binder/IPCThreadState.h>
 #include <compositionengine/Display.h>
diff --git a/services/surfaceflinger/tests/unittests/HWComposerTest.cpp b/services/surfaceflinger/tests/unittests/HWComposerTest.cpp
index 765dec3..2af0480 100644
--- a/services/surfaceflinger/tests/unittests/HWComposerTest.cpp
+++ b/services/surfaceflinger/tests/unittests/HWComposerTest.cpp
@@ -36,7 +36,7 @@
 #include "DisplayHardware/DisplayMode.h"
 #include "DisplayHardware/HWComposer.h"
 #include "DisplayHardware/Hal.h"
-#include "DisplayIdentificationTest.h"
+#include "DisplayIdentificationTestHelpers.h"
 #include "mock/DisplayHardware/MockComposer.h"
 #include "mock/DisplayHardware/MockHWC2.h"