Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BootAnimation system property to play sound." into nyc-mr1-dev

Browse Source
This commit is contained in:
Geoffrey Pitsch
2016-08-09 17:08:54 +00:00
committed by Android (Google) Code Review
parent 0b26adbb8b 305087991d
commit 3025e6be7f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/bootanimation/BootAnimation.cpp
View File

@@ -75,6 +75,7 @@ static const char ACCURATE_TIME_FLAG_FILE_PATH[] = "/data/system/time/time_is_ac
// Java timestamp format. Don't show the clock if the date is before 2000-01-01 00:00:00. // Java timestamp format. Don't show the clock if the date is before 2000-01-01 00:00:00.
static const long long ACCURATE_TIME_EPOCH = 946684800000; static const long long ACCURATE_TIME_EPOCH = 946684800000;
static const char EXIT_PROP_NAME[] = "service.bootanim.exit"; static const char EXIT_PROP_NAME[] = "service.bootanim.exit";
static const char PLAY_SOUND_PROP_NAME[] = "persist.sys.bootanim.play_sound";
static const int ANIM_ENTRY_NAME_MAX = 256; static const int ANIM_ENTRY_NAME_MAX = 256;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -778,9 +779,13 @@ bool BootAnimation::playAnimation(const Animation& animation)
// only play audio file the first time we animate the part // only play audio file the first time we animate the part
if (r == 0 && part.audioData) { if (r == 0 && part.audioData) {
// Read the system property to see if we should play the sound.
// If not present, default to playing it.
if (property_get_bool(PLAY_SOUND_PROP_NAME, 1)) {
ALOGD("playing clip for part%d, size=%d", (int) i, part.audioLength); ALOGD("playing clip for part%d, size=%d", (int) i, part.audioLength);
audioplay::playClip(part.audioData, part.audioLength); audioplay::playClip(part.audioData, part.audioLength);
} }
}
glClearColor( glClearColor(
part.backgroundColor[0], part.backgroundColor[0],