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

Commit adf6a849 authored by Hongguang Chen's avatar Hongguang Chen Committed by Automerger Merge Worker
Browse files

Merge "bootanimation: add empty lines parsing skip for desc.txt" am:... 

Merge "bootanimation: add empty lines parsing skip for desc.txt" am: 936f6610 am: ac614b3d am: d47dbbb9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2331190



Change-Id: I811ff6385955bed880f994786ce7bddc63e83965
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e66e4c20 d47dbbb9

cmds/bootanimation/BootAnimation.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,11 @@ bool BootAnimation::parseAnimationDesc(Animation& animation) { 


        int nextReadPos;



        if (strlen(l) == 0) {

            s = ++endl;

            continue;

        }



        int topLineNumbers = sscanf(l, "%d %d %d %d", &width, &height, &fps, &progress);

        if (topLineNumbers == 3 || topLineNumbers == 4) {

            // SLOGD("> w=%d, h=%d, fps=%d, progress=%d", width, height, fps, progress);