drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f20e9a88: Merge change Idf40f3b0 into eclair

Browse Source 
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2

* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
  Prevent crash in Home when using widgets whose ids collide with Home's
This commit is contained in:
Romain Guy
2009-11-05 15:47:43 -08:00
committed by Android Git Automerger
parent 1c7be08f6b f20e9a88a3
commit 8426319c5a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/appwidget/AppWidgetHostView.java
View File

@ -123,8 +123,15 @@ public class AppWidgetHostView extends FrameLayout {
@Override @Override
protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) { protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {
ParcelableSparseArray jail = (ParcelableSparseArray) container.get(generateId()); final Parcelable parcelable = container.get(generateId());
ParcelableSparseArray jail = null;
if (parcelable != null && parcelable instanceof ParcelableSparseArray) {
jail = (ParcelableSparseArray) parcelable;
}
if (jail == null) jail = new ParcelableSparseArray(); if (jail == null) jail = new ParcelableSparseArray();
super.dispatchRestoreInstanceState(jail); super.dispatchRestoreInstanceState(jail);
} }
@ -140,7 +147,7 @@ public class AppWidgetHostView extends FrameLayout {
/** /**
* Process a set of {@link RemoteViews} coming in as an update from the * Process a set of {@link RemoteViews} coming in as an update from the
* AppWidget provider. Will animate into these new views as needed. * AppWidget provider. Will animate into these new views as needed
*/ */
public void updateAppWidget(RemoteViews remoteViews) { public void updateAppWidget(RemoteViews remoteViews) {
if (LOGD) Log.d(TAG, "updateAppWidget called mOld=" + mOld); if (LOGD) Log.d(TAG, "updateAppWidget called mOld=" + mOld);

2
libs/ui/FramebufferNativeWindow.cpp
View File

@ -118,6 +118,8 @@ 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));
LOGE("xDpi %d", fbDev->xdpi);
LOGE("yDpi %d", fbDev->ydpi);
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;