ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 8aaf3e47: am a67e418e: Exit boot animation cleanly. 

* commit '8aaf3e47a51aa0beebecc8c536504d310d07cda9':
  Exit boot animation cleanly.
This commit is contained in:
Mathias Agopian 2012-06-20 13:39:58 -07:00 committed by Android Git Automerger
parent 549646d29f 8aaf3e47a5
commit aa049f0d19
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -151,7 +151,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
@ -204,7 +204,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) {
@ -308,11 +310,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(

2
services/surfaceflinger/SurfaceFlinger.h
View File

@ -316,6 +316,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,