commit d47dbbb9b1081248e12587473f2edde5650bd324
author Hongguang Chen <hgchen@google.com> Wed Dec 07 21:55:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 07 21:55:11 2022 +0000
tree ce9ee34d85d8bd7bc087be3548cf5891c75e5197
parent e01b666059f22bce7d2d7eb6dd0952183a42596e
parent ac614b3da584403a6efbfbd8db29abad14239521

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

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

Change-Id: I8cd966f9b020a3b691a21dcb66ca9fc7c63831af
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 19d863c..a25823b 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -1114,6 +1114,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);