diff options
| author | 2023-08-25 19:09:52 +0000 | |
|---|---|---|
| committer | 2023-08-25 19:09:52 +0000 | |
| commit | 4d51bc3da2647c7adee577ca6691f5161e6fc537 (patch) | |
| tree | 825254e2e9837ebafc4106cc950ce013312e6e8d /cmds/bootanimation/BootAnimation.cpp | |
| parent | ba17ce86b7777a2611c82664b5ba0567367c3cb9 (diff) | |
| parent | 94faa189471998c7d06a2c660734702c0ea72afc (diff) | |
Merge "Migrate from android::String isEmpty to empty [bootanimation]" into main am: 1de5695524 am: 757b050795 am: 94faa18947
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725975
Change-Id: I4137ba29e5bef24afab2905439be43e9c74adfc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index b8d56008657d..fd79a04814fd 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -706,7 +706,7 @@ void BootAnimation::resizeSurface(int newWidth, int newHeight) { bool BootAnimation::preloadAnimation() { findBootAnimationFile(); - if (!mZipFileName.isEmpty()) { + if (!mZipFileName.empty()) { mAnimation = loadAnimation(mZipFileName); return (mAnimation != nullptr); } @@ -819,7 +819,7 @@ bool BootAnimation::threadLoop() { // We have no bootanimation file, so we use the stock android logo // animation. - if (mZipFileName.isEmpty()) { + if (mZipFileName.empty()) { ALOGD("No animation file"); result = android(); } else { |