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

Commit 18ebf0ec authored by Carlos Martinez Romero's avatar Carlos Martinez Romero Committed by Android (Google) Code Review
Browse files

Merge "Call bootFinished using JNI."

parents dcd031a2 4609a4a6

libs/gui/SurfaceComposerClient.cpp

+6 −0
Original line number Diff line number Diff line
@@ -2155,6 +2155,12 @@ void SurfaceComposerClient::dispose() { 
    mStatus = NO_INIT;

}



status_t SurfaceComposerClient::bootFinished() {

    sp<gui::ISurfaceComposer> sf(ComposerServiceAIDL::getComposerService());

    binder::Status status = sf->bootFinished();

    return statusTFromBinderStatus(status);

}



sp<SurfaceControl> SurfaceComposerClient::createSurface(const String8& name, uint32_t w, uint32_t h,

                                                        PixelFormat format, int32_t flags,

                                                        const sp<IBinder>& parentHandle,

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

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ interface ISurfaceComposer { 
     * Signal that we're done booting.

     * Requires ACCESS_SURFACE_FLINGER permission

     */

    // Note this must be the 1st method, so IBinder::FIRST_CALL_TRANSACTION

    // is assigned, as it is called from Java by ActivityManagerService.

    void bootFinished();



    /**

libs/gui/include/gui/SurfaceComposerClient.h

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ public: 
    status_t linkToComposerDeath(const sp<IBinder::DeathRecipient>& recipient,

            void* cookie = nullptr, uint32_t flags = 0);



    // Notify the SurfaceComposerClient that the boot procedure has completed

    static status_t bootFinished();



    // Get transactional state of given display.

    static status_t getDisplayState(const sp<IBinder>& display, ui::DisplayState*);