ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "surfaceflinger: use display dpi if not forced with ro.sf.lcd_nensity"

Browse Source
This commit is contained in:
Dima Zavin 2012-03-20 23:23:35 -07:00 committed by Android (Google) Code Review
commit 4b6c4f1d58
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,15 +251,21 @@ void DisplayHardware::init(uint32_t dpy)
*/
if (property_get("qemu.sf.lcd_density", property, NULL) <= 0) {
if (property_get("ro.sf.lcd_density", property, NULL) <= 0) {
ALOGW("ro.sf.lcd_density not defined, using 160 dpi by default.");
strcpy(property, "160");
if (mDpiX && mDpiY) {
ALOGI("Using density info from display: xdpi=%d ydpi=%d\n",
mDpiX, mDpiY);
} else {
ALOGW("No display dpi and ro.sf.lcd_density not defined, using 160 dpi by default.");
mDpiX = mDpiY = 160;
}
}
} else {
/* for the emulator case, reset the dpi values too */
mDpiX = mDpiY = atoi(property);
}
mDensity = atoi(property) * (1.0f/160.0f);
/* use the xdpi as our density baseline */
mDensity = mDpiX * (1.0f / 160.0f);
/*
* Create our OpenGL ES context