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

Merge change 26623 into eclair

Browse Source 
* changes:
  fbDev wasn't initialized of hw_get_module failed, but was then used anyway.
This commit is contained in:
Android (Google) Code Review
2009-09-23 15:02:49 -04:00
parent 3f2c70fb9e e613468402
commit bdeccbba6f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ui/FramebufferNativeWindow.cpp
View File

@@ -117,7 +117,6 @@ 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;
@@ -126,6 +125,9 @@ FramebufferNativeWindow::FramebufferNativeWindow()
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;