diff options
| author | 2021-12-13 00:56:44 +0000 | |
|---|---|---|
| committer | 2021-12-13 00:56:44 +0000 | |
| commit | 2a32ff7e14aea92f1b3b2bde5fc5d08881b9b2c5 (patch) | |
| tree | 64571d53df5a6a045ac22ea64a72c203a7aa900f /cmds/bootanimation/BootAnimation.cpp | |
| parent | 8889de881e03c94a3affcb94f95a449fd192357e (diff) | |
| parent | 08de4439ac20552c97d14171c20e82f43a5329ef (diff) | |
Merge "Enable clock only when supported by product"
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index af4053fb6c8c..05a0661914dc 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -105,6 +105,7 @@ static const int TEXT_MISSING_VALUE = INT_MIN; static const char EXIT_PROP_NAME[] = "service.bootanim.exit"; static const char PROGRESS_PROP_NAME[] = "service.bootanim.progress"; static const char DISPLAYS_PROP_NAME[] = "persist.service.bootanim.displays"; +static const char CLOCK_ENABLED_PROP_NAME[] = "persist.sys.bootanim.clock.enabled"; static const int ANIM_ENTRY_NAME_MAX = ANIM_PATH_MAX + 1; static constexpr size_t TEXT_POS_LEN_MAX = 16; static const int DYNAMIC_COLOR_COUNT = 4; @@ -1320,6 +1321,8 @@ bool BootAnimation::movie() { } if (!anyPartHasClock) { mClockEnabled = false; + } else if (!android::base::GetBoolProperty(CLOCK_ENABLED_PROP_NAME, false)) { + mClockEnabled = false; } // Check if npot textures are supported |