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

Commit 7a0e3938 authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Android (Google) Code Review
Browse files

Merge "ui: Pull PhysicalDisplayId into its own header"

parents 0be01b4e 5acb2b8b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@
#include <ui/FrameStats.h>
#include <ui/GraphicBuffer.h>
#include <ui/GraphicTypes.h>
#include <ui/PhysicalDisplayId.h>
#include <ui/PixelFormat.h>

#include <utils/Errors.h>
+0 −7
Original line number Diff line number Diff line
@@ -16,19 +16,12 @@

#pragma once

#include <cinttypes>
#include <cstdint>

#include <android/hardware/graphics/common/1.1/types.h>
#include <android/hardware/graphics/common/1.2/types.h>
#include <system/graphics.h>

#define ANDROID_PHYSICAL_DISPLAY_ID_FORMAT PRIu64

namespace android {

using PhysicalDisplayId = uint64_t;

// android::ui::* in this header file will alias different types as
// the HIDL interface is updated.
namespace ui {
+32 −0
Original line number Diff line number Diff line
/*
 * Copyright 2019 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 <cinttypes>
#include <cstdint>

#define ANDROID_PHYSICAL_DISPLAY_ID_FORMAT PRIu64

namespace android {

using PhysicalDisplayId = uint64_t;

constexpr uint8_t getPhysicalDisplayPort(PhysicalDisplayId displayId) {
    return static_cast<uint8_t>(displayId);
}

} // namespace android
+1 −0
Original line number Diff line number Diff line
../../include/ui/PhysicalDisplayId.h
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
#include <string_view>
#include <vector>

#include <ui/GraphicTypes.h>
#include <ui/PhysicalDisplayId.h>

namespace android {