diff options
| author | Geoffrey Pitsch <gpitsch@google.com> | 2016-07-22 17:04:21 -0400 |
|---|---|---|
| committer | Geoffrey Pitsch <gpitsch@google.com> | 2016-08-08 16:18:21 -0400 |
| commit | 305087991d1b88d98c5e5e03fcf5a6a6e93ad356 (patch) | |
| tree | caa4d7bc52eb5fabc2896cbe37d5eb0978d4f4fd /cmds/bootanimation/BootAnimation.cpp | |
| parent | aa1e49c168321b6ca5eff7fa2c45c5751bea4724 (diff) | |
BootAnimation system property to play sound.
Optional system property "persist.sys.bootanim.play_sound"
If nonexistent, default behavior plays the sound.
Bug: 30690353
Change-Id: Ie5ed456d891632be5ec8be255ac7c1193753c741
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index ebcc9ff0451f..495e56ce64b3 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -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. static const long long ACCURATE_TIME_EPOCH = 946684800000; 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; // --------------------------------------------------------------------------- @@ -778,8 +779,12 @@ bool BootAnimation::playAnimation(const Animation& animation) // only play audio file the first time we animate the part if (r == 0 && part.audioData) { - ALOGD("playing clip for part%d, size=%d", (int) i, part.audioLength); - audioplay::playClip(part.audioData, part.audioLength); + // 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); + audioplay::playClip(part.audioData, part.audioLength); + } } glClearColor( |