Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove USE_HWC2 usage"

Browse Source 
am: 8757179e52

Change-Id: I58fbf7213d42d4b81379464051fff5ba56b99063
This commit is contained in:
John Reck
2018-11-28 17:01:38 -08:00
committed by android-build-merger
parent e364e4aa30 8757179e52
commit 70a2813e86
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/Android.bp
View File

@@ -45,9 +45,6 @@ cc_defaults {
], ],
product_variables: { product_variables: {
device_uses_hwc2: {
cflags: ["-DUSE_HWC2"],
},
eng: { eng: {
lto: { lto: {
never: true, never: true,

2
libs/hwui/JankTracker.cpp
View File

@@ -81,7 +81,6 @@ static FrameInfoIndex sFrameStart = FrameInfoIndex::IntendedVsync;
JankTracker::JankTracker(ProfileDataContainer* globalData, const DisplayInfo& displayInfo) { JankTracker::JankTracker(ProfileDataContainer* globalData, const DisplayInfo& displayInfo) {
mGlobalData = globalData; mGlobalData = globalData;
nsecs_t frameIntervalNanos = static_cast<nsecs_t>(1_s / displayInfo.fps); nsecs_t frameIntervalNanos = static_cast<nsecs_t>(1_s / displayInfo.fps);
#if USE_HWC2
nsecs_t sfOffset = frameIntervalNanos - (displayInfo.presentationDeadline - 1_ms); nsecs_t sfOffset = frameIntervalNanos - (displayInfo.presentationDeadline - 1_ms);
nsecs_t offsetDelta = sfOffset - displayInfo.appVsyncOffset; nsecs_t offsetDelta = sfOffset - displayInfo.appVsyncOffset;
// There are two different offset cases. If the offsetDelta is positive // There are two different offset cases. If the offsetDelta is positive
@@ -95,7 +94,6 @@ JankTracker::JankTracker(ProfileDataContainer* globalData, const DisplayInfo& di
// return due to the staggering of VSYNC-app & VSYNC-sf. // return due to the staggering of VSYNC-app & VSYNC-sf.
mDequeueTimeForgiveness = offsetDelta + 4_ms; mDequeueTimeForgiveness = offsetDelta + 4_ms;
} }
#endif
setFrameInterval(frameIntervalNanos); setFrameInterval(frameIntervalNanos);
} }