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

Commit 2d0d167e authored by Martijn Coenen's avatar Martijn Coenen Committed by Steven Moreland
Browse files

Don't access system properties from vendor code. 

A recently introduced optimization reduces the service polling
interval to 100ms during boot. For this it uses the boot completed
system property. However, vendor code isn't allowed to access
system properties. This change keeps the behavior as it was,
while not accessing the system prop. We can investigate later
if we can do something similar for vendor code.

Bug: 80153956
Test: builds, sailfish boots
Change-Id: Ic52039516ae3e912ff2ec7c8dced4951696678df
(cherry picked from commit 06f10ccc)
Merged-In: Ic52039516ae3e912ff2ec7c8dced4951696678df
parent b7d3be2e

libs/binder/IServiceManager.cpp

+3 −2
Original line number Diff line number Diff line
@@ -149,12 +149,13 @@ public: 
        const bool isVendorService =

            strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;

        const long timeout = uptimeMillis() + 5000;

        if (!gSystemBootCompleted) {

        if (!gSystemBootCompleted && !isVendorService) {

            // Vendor code can't access system properties

            char bootCompleted[PROPERTY_VALUE_MAX];

            property_get("sys.boot_completed", bootCompleted, "0");

            gSystemBootCompleted = strcmp(bootCompleted, "1") == 0 ? true : false;

        }

        // retry interval in millisecond.

        // retry interval in millisecond; note that vendor services stay at 100ms

        const long sleepTime = gSystemBootCompleted ? 1000 : 100;



        int n = 0;