diff options
| author | 2023-08-28 19:45:04 +0000 | |
|---|---|---|
| committer | 2023-08-28 19:45:04 +0000 | |
| commit | b5b13e510c77c1e0951005b47451c7127525bc1e (patch) | |
| tree | ca9e455a23954dc69d7635915c6894b0a4370cdc /cmds/bootanimation/BootAnimation.cpp | |
| parent | 9734602a29db8db6b0dc5ec6088100608b985741 (diff) | |
| parent | 34a4089b69d9444e055af1dd29b259ad3cde4b98 (diff) | |
Merge "Migrate from android::String isEmpty to empty [bootanimation]" into main am: 1de5695524 am: 757b050795 am: 94faa18947 am: 4d51bc3da2 am: 34a4089b69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725975
Change-Id: I4c1ea79beb47456766940332593553e1e012c7b7
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 b56dceb9393f..2cbd665ec25a 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -723,7 +723,7 @@ void BootAnimation::resizeSurface(int newWidth, int newHeight) { bool BootAnimation::preloadAnimation() { ATRACE_CALL(); findBootAnimationFile(); - if (!mZipFileName.isEmpty()) { + if (!mZipFileName.empty()) { mAnimation = loadAnimation(mZipFileName); return (mAnimation != nullptr); } @@ -842,7 +842,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 { |