diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-15 22:41:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-15 22:41:16 +0000 |
| commit | 79e0f7f4bbe65e0c44449ca1f335a39f5ade581a (patch) | |
| tree | f9c4ae727302dcb9214cb9ceb1e5f2f904ca18cc /services/surfaceflinger/BufferQueueLayer.cpp | |
| parent | 46c6532f355a09f618e378007151fb983ea82fb0 (diff) | |
| parent | afb458444d86962812d74a792a2dad907ec6bd1c (diff) | |
| download | android_frameworks_native-79e0f7f4bbe65e0c44449ca1f335a39f5ade581a.tar.gz android_frameworks_native-79e0f7f4bbe65e0c44449ca1f335a39f5ade581a.tar.bz2 android_frameworks_native-79e0f7f4bbe65e0c44449ca1f335a39f5ade581a.zip | |
Merge changes from topic "scheduler::123998711"
* changes:
SF: Adding testable Scheduler and updating tests.
SF: Migrate to Scheduler and clean up duplicate code.
Diffstat (limited to 'services/surfaceflinger/BufferQueueLayer.cpp')
| -rw-r--r-- | services/surfaceflinger/BufferQueueLayer.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp index 5fe8067d1..b3e2a4b01 100644 --- a/services/surfaceflinger/BufferQueueLayer.cpp +++ b/services/surfaceflinger/BufferQueueLayer.cpp @@ -236,9 +236,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t getProducerStickyTransform() != 0, mName.string(), mOverrideScalingMode, getTransformToDisplayInverse(), mFreezeGeometryUpdates); - nsecs_t expectedPresentTime = mFlinger->mUseScheduler - ? mFlinger->mScheduler->expectedPresentTime() - : mFlinger->mPrimaryDispSync->expectedPresentTime(); + nsecs_t expectedPresentTime = mFlinger->mScheduler->expectedPresentTime(); if (isRemovedFromCurrentState()) { expectedPresentTime = 0; @@ -400,10 +398,8 @@ void BufferQueueLayer::onFrameAvailable(const BufferItem& item) { // Add this buffer from our internal queue tracker { // Autolock scope // Report the requested present time to the Scheduler. - if (mFlinger->mUseScheduler) { - mFlinger->mScheduler->addFramePresentTimeForLayer(item.mTimestamp, - item.mIsAutoTimestamp, mName.c_str()); - } + mFlinger->mScheduler->addFramePresentTimeForLayer(item.mTimestamp, item.mIsAutoTimestamp, + mName.c_str()); Mutex::Autolock lock(mQueueItemLock); // Reset the frame number tracker when we receive the first buffer after |