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

Commit 8aaf3e47 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am a67e418e: Exit boot animation cleanly. 

* commit 'a67e418e':
  Exit boot animation cleanly.
parents fb05c7c3 a67e418e

services/surfaceflinger/SurfaceFlinger.cpp

+11 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void SurfaceFlinger::binderDied(const wp<IBinder>& who) 
    setTransactionState(state, eOrientationDefault, 0);



    // restart the boot-animation

    property_set("ctl.start", "bootanim");

    startBootAnim();

}



sp<IMemoryHeap> SurfaceFlinger::getCblk() const
@@ -201,7 +201,9 @@ void SurfaceFlinger::bootFinished() 
    }



    // stop boot animation

    property_set("ctl.stop", "bootanim");

    // formerly we would just kill the process, but we now ask it to exit so it

    // can choose where to stop the animation.

    property_set("service.bootanim.exit", "1");

}



static inline uint16_t pack565(int r, int g, int b) {
@@ -306,11 +308,17 @@ status_t SurfaceFlinger::readyToRun() 
    mReadyToRunBarrier.open();



    // start boot animation

    property_set("ctl.start", "bootanim");

    startBootAnim();



    return NO_ERROR;

}



void SurfaceFlinger::startBootAnim() {

    // start boot animation

    property_set("service.bootanim.exit", "0");

    property_set("ctl.start", "bootanim");

}



// ----------------------------------------------------------------------------



bool SurfaceFlinger::authenticateSurfaceTexture(

services/surfaceflinger/SurfaceFlinger.h

+2 −0
Original line number Diff line number Diff line
@@ -351,6 +351,8 @@ private: 
            void        debugFlashRegions();

            void        drawWormhole() const;



            void        startBootAnim();



            void listLayersLocked(const Vector<String16>& args, size_t& index,

                    String8& result, char* buffer, size_t SIZE) const;

            void dumpStatsLocked(const Vector<String16>& args, size_t& index,