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

Merge change 4718 into donut

Browse Source 
* changes:
  Fix sim-eng build and simplify previous lcd-density related patch
This commit is contained in:
Android (Google) Code Review
2009-06-18 19:45:07 -07:00
parent 63e7155c7d 3c08a446c5
commit c628297718
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
View File

@@ -189,16 +189,13 @@ void DisplayHardware::init(uint32_t dpy)
char property[PROPERTY_VALUE_MAX]; char property[PROPERTY_VALUE_MAX];
if (property_get("ro.sf.lcd_density", property, NULL) <= 0) { /* Read density from build-specific ro.sf.lcd_density property
LOGW("ro.sf.lcd_density not defined, using 160 dpi by default."); * except if it is overriden by qemu.sf.lcd_density.
strcpy(property, "160"); */
} if (property_get("qemu.sf.lcd_density", property, NULL) <= 0) {
if (property_get("ro.sf.lcd_density", property, NULL) <= 0) {
/* Override the property value if qemu.sf.lcd_density is defined. */ LOGW("ro.sf.lcd_density not defined, using 160 dpi by default.");
{ strcpy(property, "160");
char qemu_property[PROPERTY_VALUE_MAX];
if (property_get("qemu.sf.lcd_density", qemu_property, NULL) > 0) {
strlcpy(property, qemu_property, sizeof property);
} }
} }
mDensity = atoi(property) * (1.0f/160.0f); mDensity = atoi(property) * (1.0f/160.0f);