Merge change Idf40f3b0 into eclair

* changes:
  Prevent crash in Home when using widgets whose ids collide with Home's resources.
This commit is contained in:
Android (Google) Code Review 2009-11-05 18:42:14 -05:00
commit 653e129a82

View File

@ -118,6 +118,8 @@ FramebufferNativeWindow::FramebufferNativeWindow()
LOGE_IF(err, "fb buffer 1 allocation failed w=%d, h=%d, err=%s",
fbDev->width, fbDev->height, strerror(-err));
LOGE("xDpi %d", fbDev->xdpi);
LOGE("yDpi %d", fbDev->ydpi);
const_cast<uint32_t&>(android_native_window_t::flags) = fbDev->flags;
const_cast<float&>(android_native_window_t::xdpi) = fbDev->xdpi;
const_cast<float&>(android_native_window_t::ydpi) = fbDev->ydpi;