diff options
| author | Steven Laver <lavers@google.com> | 2020-02-05 04:53:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-05 04:53:02 +0000 |
| commit | 7b580ef87b3de7e15830061e1ca14e56158958ad (patch) | |
| tree | 7a80c238d24f4ab5526b3c5dda0737c2d4ea185e /cmds/bootanimation/BootAnimation.cpp | |
| parent | 18124769b74c399f72db971d7f81c19995f46bcb (diff) | |
| parent | 3f5215260fe8574b4e9a30f21c0449971b220d6c (diff) | |
Merge changes from topic "RP1A.200123.001" into r-keystone-qcom-dev
* changes:
Replace getActivityStack() for getRootTask()
wifi: promote wifi APIs to @SystemApi
Add TETHERING_WIGIG to TetheringManager
CountryDetector is no longer needed for PhoneNumberUtils
Merge RP1A.200123.001
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 459520a3eb27..2537edaf9e81 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -100,6 +100,7 @@ static constexpr size_t FONT_NUM_ROWS = FONT_NUM_CHARS / FONT_NUM_COLS; static const int TEXT_CENTER_VALUE = INT_MAX; static const int TEXT_MISSING_VALUE = INT_MIN; static const char EXIT_PROP_NAME[] = "service.bootanim.exit"; +static const char DISPLAYS_PROP_NAME[] = "persist.service.bootanim.displays"; static const int ANIM_ENTRY_NAME_MAX = ANIM_PATH_MAX + 1; static constexpr size_t TEXT_POS_LEN_MAX = 16; @@ -291,10 +292,10 @@ status_t BootAnimation::readyToRun() { // this guest property specifies multi-display IDs to show the boot animation // multiple ids can be set with comma (,) as separator, for example: - // setprop boot.animation.displays 19260422155234049,19261083906282754 + // setprop persist.boot.animation.displays 19260422155234049,19261083906282754 Vector<uint64_t> physicalDisplayIds; char displayValue[PROPERTY_VALUE_MAX] = ""; - property_get("boot.animation.displays", displayValue, ""); + property_get(DISPLAYS_PROP_NAME, displayValue, ""); bool isValid = displayValue[0] != '\0'; if (isValid) { char *p = displayValue; @@ -306,7 +307,7 @@ status_t BootAnimation::readyToRun() { p ++; } if (!isValid) - SLOGE("Invalid syntax for the value of system prop: boot.animation.displays"); + SLOGE("Invalid syntax for the value of system prop: %s", DISPLAYS_PROP_NAME); } if (isValid) { std::istringstream stream(displayValue); @@ -1113,7 +1114,7 @@ void BootAnimation::handleViewport(nsecs_t timestep) { SurfaceComposerClient::Transaction t; t.setPosition(mFlingerSurfaceControl, 0, -mTargetInset) .setCrop(mFlingerSurfaceControl, Rect(0, mTargetInset, mWidth, mHeight)); - t.setDisplayProjection(mDisplayToken, 0 /* orientation */, layerStackRect, displayRect); + t.setDisplayProjection(mDisplayToken, ui::ROTATION_0, layerStackRect, displayRect); t.apply(); mTargetInset = mCurrentInset = 0; |