diff options
| author | 2023-08-25 17:42:48 +0000 | |
|---|---|---|
| committer | 2023-08-25 17:42:48 +0000 | |
| commit | 757b050795a5246423dd29b7f0a7630ae4f2fe8a (patch) | |
| tree | e28d44542171f07413ec308413d5cc2dd9944dcf /cmds/bootanimation/BootAnimation.cpp | |
| parent | d87779d303cb8185b2b0f8acc99bd27ddf84f3dd (diff) | |
| parent | 1de5695524c40bf9c6dc555198c63d21c3647252 (diff) | |
Merge "Migrate from android::String isEmpty to empty [bootanimation]" into main am: 1de5695524
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725975
Change-Id: I6a1fedc371d908046174c3b52546569925ca8054
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 8ceb9ec13d88..74ca41d0f9b4 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -691,7 +691,7 @@ void BootAnimation::resizeSurface(int newWidth, int newHeight) { bool BootAnimation::preloadAnimation() { findBootAnimationFile(); - if (!mZipFileName.isEmpty()) { + if (!mZipFileName.empty()) { mAnimation = loadAnimation(mZipFileName); return (mAnimation != nullptr); } @@ -821,7 +821,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 { |