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

Commit ca3d9a42 authored by Huihong Luo's avatar Huihong Luo
Browse files

Convert DisplayPrimaries to AIDL parcelable 

And migrate related ISurfaceComposer::getDisplayNativePrimaries() method to AIDL.
(1) add android::gui::DisplayNativePrimaries parcelable for serialization
(2) convert between ui::DisplayPrimaries and gui::DisplayPrimaries
(3) migrate setActiveColorMode
(4) migrate setBootDisplayMode

Bug: 220894272
Test: atest libgui_test
Change-Id: I1371f6ef2c1f52f56db53d437cf919ee7f269b48
parent c6855f85

libs/gui/ISurfaceComposer.cpp

+0 −131
Original line number Diff line number Diff line
@@ -225,82 +225,6 @@ public: 
        return result;

    }



    status_t getDisplayNativePrimaries(const sp<IBinder>& display,

                                       ui::DisplayPrimaries& primaries) override {

        Parcel data, reply;

        status_t result = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        if (result != NO_ERROR) {

            ALOGE("getDisplayNativePrimaries failed to writeInterfaceToken: %d", result);

            return result;

        }

        result = data.writeStrongBinder(display);

        if (result != NO_ERROR) {

            ALOGE("getDisplayNativePrimaries failed to writeStrongBinder: %d", result);

            return result;

        }

        result = remote()->transact(BnSurfaceComposer::GET_DISPLAY_NATIVE_PRIMARIES, data, &reply);

        if (result != NO_ERROR) {

            ALOGE("getDisplayNativePrimaries failed to transact: %d", result);

            return result;

        }

        result = reply.readInt32();

        if (result == NO_ERROR) {

            memcpy(&primaries, reply.readInplace(sizeof(ui::DisplayPrimaries)),

                    sizeof(ui::DisplayPrimaries));

        }

        return result;

    }



    status_t setActiveColorMode(const sp<IBinder>& display, ColorMode colorMode) override {

        Parcel data, reply;

        status_t result = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        if (result != NO_ERROR) {

            ALOGE("setActiveColorMode failed to writeInterfaceToken: %d", result);

            return result;

        }

        result = data.writeStrongBinder(display);

        if (result != NO_ERROR) {

            ALOGE("setActiveColorMode failed to writeStrongBinder: %d", result);

            return result;

        }

        result = data.writeInt32(static_cast<int32_t>(colorMode));

        if (result != NO_ERROR) {

            ALOGE("setActiveColorMode failed to writeInt32: %d", result);

            return result;

        }

        result = remote()->transact(BnSurfaceComposer::SET_ACTIVE_COLOR_MODE, data, &reply);

        if (result != NO_ERROR) {

            ALOGE("setActiveColorMode failed to transact: %d", result);

            return result;

        }

        return static_cast<status_t>(reply.readInt32());

    }



    status_t setBootDisplayMode(const sp<IBinder>& display,

                                ui::DisplayModeId displayModeId) override {

        Parcel data, reply;

        status_t result = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        if (result != NO_ERROR) {

            ALOGE("setBootDisplayMode failed to writeInterfaceToken: %d", result);

            return result;

        }

        result = data.writeStrongBinder(display);

        if (result != NO_ERROR) {

            ALOGE("setBootDisplayMode failed to writeStrongBinder: %d", result);

            return result;

        }

        result = data.writeInt32(displayModeId);

        if (result != NO_ERROR) {

            ALOGE("setBootDisplayMode failed to writeIint32: %d", result);

            return result;

        }

        result = remote()->transact(BnSurfaceComposer::SET_BOOT_DISPLAY_MODE, data, &reply);

        if (result != NO_ERROR) {

            ALOGE("setBootDisplayMode failed to transact: %d", result);

        }

        return result;

    }



    status_t clearAnimationFrameStats() override {

        Parcel data, reply;

        status_t result = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
@@ -1122,61 +1046,6 @@ status_t BnSurfaceComposer::onTransact( 
            reply->writeStrongBinder(IInterface::asBinder(connection));

            return NO_ERROR;

        }

        case GET_DISPLAY_NATIVE_PRIMARIES: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            ui::DisplayPrimaries primaries;

            sp<IBinder> display = nullptr;



            status_t result = data.readStrongBinder(&display);

            if (result != NO_ERROR) {

                ALOGE("getDisplayNativePrimaries failed to readStrongBinder: %d", result);

                return result;

            }



            result = getDisplayNativePrimaries(display, primaries);

            reply->writeInt32(result);

            if (result == NO_ERROR) {

                memcpy(reply->writeInplace(sizeof(ui::DisplayPrimaries)), &primaries,

                        sizeof(ui::DisplayPrimaries));

            }



            return NO_ERROR;

        }

        case SET_ACTIVE_COLOR_MODE: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            sp<IBinder> display = nullptr;

            status_t result = data.readStrongBinder(&display);

            if (result != NO_ERROR) {

                ALOGE("getActiveColorMode failed to readStrongBinder: %d", result);

                return result;

            }

            int32_t colorModeInt = 0;

            result = data.readInt32(&colorModeInt);

            if (result != NO_ERROR) {

                ALOGE("setActiveColorMode failed to readInt32: %d", result);

                return result;

            }

            result = setActiveColorMode(display,

                    static_cast<ColorMode>(colorModeInt));

            result = reply->writeInt32(result);

            return result;

        }

        case SET_BOOT_DISPLAY_MODE: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            sp<IBinder> display = nullptr;

            status_t result = data.readStrongBinder(&display);

            if (result != NO_ERROR) {

                ALOGE("setBootDisplayMode failed to readStrongBinder: %d", result);

                return result;

            }

            ui::DisplayModeId displayModeId;

            result = data.readInt32(&displayModeId);

            if (result != NO_ERROR) {

                ALOGE("setBootDisplayMode failed to readInt32: %d", result);

                return result;

            }

            return setBootDisplayMode(display, displayModeId);

        }

        case CLEAR_ANIMATION_FRAME_STATS: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            status_t result = clearAnimationFrameStats();

libs/gui/SurfaceComposerClient.cpp

+28 −3
Original line number Diff line number Diff line
@@ -2278,12 +2278,35 @@ status_t SurfaceComposerClient::getDesiredDisplayModeSpecs(const sp<IBinder>& di 


status_t SurfaceComposerClient::getDisplayNativePrimaries(const sp<IBinder>& display,

        ui::DisplayPrimaries& outPrimaries) {

    return ComposerService::getComposerService()->getDisplayNativePrimaries(display, outPrimaries);

    gui::DisplayPrimaries primaries;

    binder::Status status =

            ComposerServiceAIDL::getComposerService()->getDisplayNativePrimaries(display,

                                                                                 &primaries);

    if (status.isOk()) {

        outPrimaries.red.X = primaries.red.X;

        outPrimaries.red.Y = primaries.red.Y;

        outPrimaries.red.Z = primaries.red.Z;



        outPrimaries.green.X = primaries.green.X;

        outPrimaries.green.Y = primaries.green.Y;

        outPrimaries.green.Z = primaries.green.Z;



        outPrimaries.blue.X = primaries.blue.X;

        outPrimaries.blue.Y = primaries.blue.Y;

        outPrimaries.blue.Z = primaries.blue.Z;



        outPrimaries.white.X = primaries.white.X;

        outPrimaries.white.Y = primaries.white.Y;

        outPrimaries.white.Z = primaries.white.Z;

    }

    return status.transactionError();

}



status_t SurfaceComposerClient::setActiveColorMode(const sp<IBinder>& display,

        ColorMode colorMode) {

    return ComposerService::getComposerService()->setActiveColorMode(display, colorMode);

    binder::Status status = ComposerServiceAIDL::getComposerService()

                                    ->setActiveColorMode(display, static_cast<int>(colorMode));

    return status.transactionError();

}



status_t SurfaceComposerClient::getBootDisplayModeSupport(bool* support) {
@@ -2294,7 +2317,9 @@ status_t SurfaceComposerClient::getBootDisplayModeSupport(bool* support) { 


status_t SurfaceComposerClient::setBootDisplayMode(const sp<IBinder>& display,

                                                   ui::DisplayModeId displayModeId) {

    return ComposerService::getComposerService()->setBootDisplayMode(display, displayModeId);

    binder::Status status = ComposerServiceAIDL::getComposerService()

                                    ->setBootDisplayMode(display, static_cast<int>(displayModeId));

    return status.transactionError();

}



status_t SurfaceComposerClient::clearBootDisplayMode(const sp<IBinder>& display) {

libs/gui/aidl/android/gui/DisplayPrimaries.aidl

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

 * 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.

 */



package android.gui;



// copied from libui ConfigStoreTypes.h



/** @hide */

parcelable DisplayPrimaries {

    parcelable CieXyz {

        float X;

        float Y;

        float Z;

    }



    CieXyz red;

    CieXyz green;

    CieXyz blue;

    CieXyz white;

}

libs/gui/aidl/android/gui/ISurfaceComposer.aidl

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.gui; 


import android.gui.DisplayCaptureArgs;

import android.gui.DisplayBrightness;

import android.gui.DisplayPrimaries;

import android.gui.DisplayState;

import android.gui.DisplayStatInfo;

import android.gui.StaticDisplayInfo;
@@ -75,6 +76,15 @@ interface ISurfaceComposer { 
     */

    DynamicDisplayInfo getDynamicDisplayInfo(IBinder display);



    DisplayPrimaries getDisplayNativePrimaries(IBinder display);



    void setActiveColorMode(IBinder display, int colorMode);



    /**

     * Sets the user-preferred display mode that a device should boot in.

     */

    void setBootDisplayMode(IBinder display, int displayModeId);



    /**

     * Clears the user-preferred display mode. The device should now boot in system preferred

     * display mode.

libs/gui/include/gui/ISurfaceComposer.h

+6 −16
Original line number Diff line number Diff line
@@ -160,16 +160,6 @@ public: 
    virtual status_t getSupportedFrameTimestamps(

            std::vector<FrameEvent>* outSupported) const = 0;



    virtual status_t getDisplayNativePrimaries(const sp<IBinder>& display,

            ui::DisplayPrimaries& primaries) = 0;

    virtual status_t setActiveColorMode(const sp<IBinder>& display,

            ui::ColorMode colorMode) = 0;



    /**

     * Sets the user-preferred display mode that a device should boot in.

     */

    virtual status_t setBootDisplayMode(const sp<IBinder>& display, ui::DisplayModeId) = 0;



    /* Clears the frame statistics for animations.

     *

     * Requires the ACCESS_SURFACE_FLINGER permission.
@@ -452,7 +442,7 @@ public: 
        GET_HDR_CAPABILITIES,    // Deprecated. Use GET_DYNAMIC_DISPLAY_INFO instead.

        GET_DISPLAY_COLOR_MODES, // Deprecated. Use GET_DYNAMIC_DISPLAY_INFO instead.

        GET_ACTIVE_COLOR_MODE,   // Deprecated. Use GET_DYNAMIC_DISPLAY_INFO instead.

        SET_ACTIVE_COLOR_MODE,

        SET_ACTIVE_COLOR_MODE,   // Deprecated. Autogenerated by .aidl now.

        ENABLE_VSYNC_INJECTIONS,

        INJECT_VSYNC,

        GET_LAYER_DEBUG_INFO,
@@ -463,7 +453,7 @@ public: 
        GET_DISPLAYED_CONTENT_SAMPLE,

        GET_PROTECTED_CONTENT_SUPPORT,

        IS_WIDE_COLOR_DISPLAY,        // Deprecated. Autogenerated by .aidl now.

        GET_DISPLAY_NATIVE_PRIMARIES,

        GET_DISPLAY_NATIVE_PRIMARIES, // Deprecated. Autogenerated by .aidl now.

        GET_PHYSICAL_DISPLAY_IDS,     // Deprecated. Autogenerated by .aidl now.

        ADD_REGION_SAMPLING_LISTENER,

        REMOVE_REGION_SAMPLING_LISTENER,
@@ -499,7 +489,7 @@ public: 
        GET_PRIMARY_PHYSICAL_DISPLAY_ID, // Deprecated. Autogenerated by .aidl now.

        GET_DISPLAY_DECORATION_SUPPORT,

        GET_BOOT_DISPLAY_MODE_SUPPORT, // Deprecated. Autogenerated by .aidl now.

        SET_BOOT_DISPLAY_MODE,

        SET_BOOT_DISPLAY_MODE,         // Deprecated. Autogenerated by .aidl now.

        CLEAR_BOOT_DISPLAY_MODE,       // Deprecated. Autogenerated by .aidl now.

        SET_OVERRIDE_FRAME_RATE,

        // Always append new enum to the end.