commit adf6a849b11cfe967252594d5806d1555560e697
author Hongguang Chen <hgchen@google.com> Wed Dec 07 22:24:18 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 07 22:24:18 2022 +0000
tree 2411030800c17db28cae5a08069168709e486229
parent e66e4c201c4e8d1096505a4b715b42499d475ad1
parent d47dbbb9b1081248e12587473f2edde5650bd324

Merge "bootanimation: add empty lines parsing skip for desc.txt" am: 936f661025 am: ac614b3da5 am: d47dbbb9b1

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

Change-Id: I811ff6385955bed880f994786ce7bddc63e83965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/bootanimation/BootAnimation.cpp

diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index c4d90c6..80512f7 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -1112,6 +1112,11 @@
 
         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);