Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcf939f7 authored by Rahul Banerjee's avatar Rahul Banerjee
Browse files

Remove defunct sysprop in preparation for multi-display bootanim. 

Bug: 335406617
Test: Manual (build, flash, reboot)
Change-Id: Id82aa1448a097bbc7dd32952a78f1a64ef1693a0
parent c09e63ed

cmds/bootanimation/BootAnimation.cpp

+4 −55
Original line number Original line Diff line number Diff line
@@ -106,7 +106,6 @@ static const int TEXT_CENTER_VALUE = INT_MAX; 
static const int TEXT_MISSING_VALUE = INT_MIN;

static const int TEXT_MISSING_VALUE = INT_MIN;

static const char EXIT_PROP_NAME[] = "service.bootanim.exit";

static const char EXIT_PROP_NAME[] = "service.bootanim.exit";

static const char PROGRESS_PROP_NAME[] = "service.bootanim.progress";

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 char CLOCK_ENABLED_PROP_NAME[] = "persist.sys.bootanim.clock.enabled";

static const int ANIM_ENTRY_NAME_MAX = ANIM_PATH_MAX + 1;

static const int ANIM_ENTRY_NAME_MAX = ANIM_PATH_MAX + 1;

static const int MAX_CHECK_EXIT_INTERVAL_US = 50000;

static const int MAX_CHECK_EXIT_INTERVAL_US = 50000;
@@ -514,51 +513,10 @@ status_t BootAnimation::readyToRun() { 
        return NAME_NOT_FOUND;

        return NAME_NOT_FOUND;

    }

    }





    // this system property specifies multi-display IDs to show the boot animation

    // multiple ids can be set with comma (,) as separator, for example:

    // setprop persist.boot.animation.displays 19260422155234049,19261083906282754

    Vector<PhysicalDisplayId> physicalDisplayIds;

    char displayValue[PROPERTY_VALUE_MAX] = "";

    property_get(DISPLAYS_PROP_NAME, displayValue, "");

    bool isValid = displayValue[0] != '\0';

    if (isValid) {

        char *p = displayValue;

        while (*p) {

            if (!isdigit(*p) && *p != ',') {

                isValid = false;

                break;

            }

            p ++;

        }

        if (!isValid)

            SLOGE("Invalid syntax for the value of system prop: %s", DISPLAYS_PROP_NAME);

    }

    if (isValid) {

        std::istringstream stream(displayValue);

        for (PhysicalDisplayId id; stream >> id.value; ) {

            physicalDisplayIds.add(id);

            if (stream.peek() == ',')

                stream.ignore();

        }



        // the first specified display id is used to retrieve mDisplayToken

        for (const auto id : physicalDisplayIds) {

            if (std::find(ids.begin(), ids.end(), id) != ids.end()) {

                if (const auto token = SurfaceComposerClient::getPhysicalDisplayToken(id)) {

                    mDisplayToken = token;

                    break;

                }

            }

        }

    }



    // If the system property is not present or invalid, display 0 is used

    if (mDisplayToken == nullptr) {

    mDisplayToken = SurfaceComposerClient::getPhysicalDisplayToken(ids.front());

    mDisplayToken = SurfaceComposerClient::getPhysicalDisplayToken(ids.front());

    if (mDisplayToken == nullptr) {

    if (mDisplayToken == nullptr) {

        return NAME_NOT_FOUND;

        return NAME_NOT_FOUND;

    }

    }

    }





    DisplayMode displayMode;

    DisplayMode displayMode;

    const status_t error =

    const status_t error =
@@ -577,17 +535,8 @@ status_t BootAnimation::readyToRun() { 
            ISurfaceComposerClient::eOpaque);

            ISurfaceComposerClient::eOpaque);





    SurfaceComposerClient::Transaction t;

    SurfaceComposerClient::Transaction t;

    if (isValid) {

    t.setDisplayLayerStack(mDisplayToken, ui::DEFAULT_LAYER_STACK);

        // In the case of multi-display, boot animation shows on the specified displays

        for (const auto id : physicalDisplayIds) {

            if (std::find(ids.begin(), ids.end(), id) != ids.end()) {

                if (const auto token = SurfaceComposerClient::getPhysicalDisplayToken(id)) {

                    t.setDisplayLayerStack(token, ui::DEFAULT_LAYER_STACK);

                }

            }

        }

    t.setLayerStack(control, ui::DEFAULT_LAYER_STACK);

    t.setLayerStack(control, ui::DEFAULT_LAYER_STACK);

    }





    t.setLayer(control, 0x40000000)

    t.setLayer(control, 0x40000000)

        .apply();

        .apply();