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

Commit 5e8bb86e authored by Geoffrey Pitsch's avatar Geoffrey Pitsch Committed by android-build-merger
Browse files

BootAnimation system property to play sound. am: 30508799

am: 8e4b8a98

Change-Id: Icd062a5b3eb9da9d9c7bd3c5d7dd4e40f75c3a1e
parents cfc82ac0 8e4b8a98
Loading
Loading
Loading
Loading
+7 −2
Original line number Original line Diff line number Diff line
@@ -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;


// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
@@ -779,9 +780,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],