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

am bdeccbba: Merge change 26623 into eclair

Browse Source 
Merge commit 'bdeccbba6f6ed49da4e8e668d62754bc7263e9ce' into eclair-plus-aosp

* commit 'bdeccbba6f6ed49da4e8e668d62754bc7263e9ce':
  fbDev wasn't initialized of hw_get_module failed, but was then used anyway.
This commit is contained in:
Marco Nelissen
2009-09-23 12:51:05 -07:00
committed by Android Git Automerger
parent e201a1df14 bdeccbba6f
commit d6f3b0b5ba
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/ui/FramebufferNativeWindow.cpp
View File

@@ -117,15 +117,17 @@ FramebufferNativeWindow::FramebufferNativeWindow()
LOGE_IF(err, "fb buffer 1 allocation failed w=%d, h=%d, err=%s", LOGE_IF(err, "fb buffer 1 allocation failed w=%d, h=%d, err=%s",
fbDev->width, fbDev->height, strerror(-err)); fbDev->width, fbDev->height, strerror(-err));
}
const_cast<uint32_t&>(android_native_window_t::flags) = fbDev->flags; 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::xdpi) = fbDev->xdpi;
const_cast<float&>(android_native_window_t::ydpi) = fbDev->ydpi; const_cast<float&>(android_native_window_t::ydpi) = fbDev->ydpi;
const_cast<int&>(android_native_window_t::minSwapInterval) = const_cast<int&>(android_native_window_t::minSwapInterval) =
fbDev->minSwapInterval; fbDev->minSwapInterval;
const_cast<int&>(android_native_window_t::maxSwapInterval) = const_cast<int&>(android_native_window_t::maxSwapInterval) =
fbDev->maxSwapInterval; fbDev->maxSwapInterval;
} else {
LOGE("Couldn't get gralloc module");
}
android_native_window_t::setSwapInterval = setSwapInterval; android_native_window_t::setSwapInterval = setSwapInterval;
android_native_window_t::dequeueBuffer = dequeueBuffer; android_native_window_t::dequeueBuffer = dequeueBuffer;