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

Commit 206ba410 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12770256 from 8c6afcf1 to 25Q1-release 

Change-Id: I25622295595b2d43ee6c59b17d9ad18802c41ec9
parents 97ec8a81 8c6afcf1

cmds/servicemanager/main.cpp

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ int main(int argc, char** argv) { 
    IPCThreadState::self()->disableBackgroundScheduling(true);



    sp<ServiceManager> manager = sp<ServiceManager>::make(std::make_unique<Access>());

    manager->setRequestingSid(true);

    if (!manager->addService("manager", manager, false /*allowIsolated*/, IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT).isOk()) {

        LOG(ERROR) << "Could not self register servicemanager";

    }

services/surfaceflinger/Scheduler/Scheduler.h

+1 −1
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ public: 
        ftl::FakeGuard guard(kMainThreadContext);

        resyncToHardwareVsyncLocked(id, allowToEnable, modePtr);

    }

    void resync() override EXCLUDES(mDisplayLock);

    void forceNextResync() { mLastResyncTime = 0; }



    // Passes a vsync sample to VsyncController. Returns true if
@@ -470,7 +471,6 @@ private: 
    bool throttleVsync(TimePoint, uid_t) override;

    // Get frame interval

    Period getVsyncPeriod(uid_t) override EXCLUDES(mDisplayLock);

    void resync() override EXCLUDES(mDisplayLock);

    void onExpectedPresentTimePosted(TimePoint expectedPresentTime) override EXCLUDES(mDisplayLock);



    std::unique_ptr<EventThread> mRenderEventThread;

services/surfaceflinger/SurfaceFlinger.cpp

+1 −0
Original line number Diff line number Diff line
@@ -4566,6 +4566,7 @@ void SurfaceFlinger::setTransactionFlags(uint32_t mask, TransactionSchedule sche 
    SFTRACE_INT("mTransactionFlags", transactionFlags);



    if (const bool scheduled = transactionFlags & mask; !scheduled) {

        mScheduler->resync();

        scheduleCommit(frameHint);

    } else if (frameHint == FrameHint::kActive) {

        // Even if the next frame is already scheduled, we should reset the idle timer