drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1

Browse Source
This commit is contained in:
Mathias Agopian
2011-11-04 19:57:59 -07:00
committed by Android (Google) Code Review
parent 88061d6b38 222357f33a
commit 3f24589edd
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -226,11 +226,6 @@ public class WindowManagerService extends IWindowManager.Stub
*/
static final int DEFAULT_FADE_IN_OUT_DURATION = 400;
/**
* Frame rate. TODO: Replace with Display.getRefreshRate() when that is reliable.
*/
static final int FRAME_RATE = 48;
/**
* If true, the window manager will do its own custom freezing and general
* management of the screen during rotation.
@ -8687,7 +8682,8 @@ public class WindowManagerService extends IWindowManager.Stub
if (needRelayout) {
requestAnimationLocked(0);
} else if (animating) {
requestAnimationLocked(currentTime+(1000/FRAME_RATE)-SystemClock.uptimeMillis());
final int refreshTimeUs = (int)(1000 / mDisplay.getRefreshRate());
requestAnimationLocked(currentTime + refreshTimeUs - SystemClock.uptimeMillis());
}
// Finally update all input windows now that the window changes have stabilized.

4
services/surfaceflinger/Android.mk
View File

@ -30,6 +30,10 @@ ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)
LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY -DNEVER_DEFAULT_TO_ASYNC_MODE
endif
ifneq (,$(findstring $(TARGET_DEVICE),tuna toro maguro))
LOCAL_CFLAGS += -DREFRESH_RATE=48
endif
LOCAL_SHARED_LIBRARIES := \
libcutils \

11
services/surfaceflinger/DisplayHardware/DisplayHardware.cpp
View File

@ -141,6 +141,17 @@ void DisplayHardware::init(uint32_t dpy)
mDpiY = mNativeWindow->ydpi;
mRefreshRate = fbDev->fps;
/* FIXME: this is a temporary HACK until we are able to report the refresh rate
* properly from the HAL. The WindowManagerService now relies on this value.
*/
#ifndef REFRESH_RATE
mRefreshRate = fbDev->fps;
#else
mRefreshRate = REFRESH_RATE;
#warning "refresh rate set via makefile to REFRESH_RATE"
#endif
EGLint w, h, dummy;
EGLint numConfigs=0;
EGLSurface surface;