summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-01-26 18:46:29 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-26 18:46:29 -0800
commitede54ce2fe3252d4ab56b90de464b35a6920970d (patch)
treea6af395f568be9ae9b678a39b18e5fcddb7c573d /core
parent9c8307fb19558ffe2e897bad009fb038bb9e845b (diff)
parent0c75622cf80e53c13d079bfe1f3df0b185c4f02d (diff)
downloadframeworks_base-ede54ce2fe3252d4ab56b90de464b35a6920970d.zip
frameworks_base-ede54ce2fe3252d4ab56b90de464b35a6920970d.tar.gz
frameworks_base-ede54ce2fe3252d4ab56b90de464b35a6920970d.tar.bz2
Merge "Fix crash in movie studio." into honeycomb
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/SurfaceView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 988ccef..966bd8d 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -169,7 +169,7 @@ public class SurfaceView extends View {
@Override
public boolean onPreDraw() {
// reposition ourselves where the surface is
- mHaveFrame = true;
+ mHaveFrame = getWidth() > 0 && getHeight() > 0;
updateWindow(false, false);
return true;
}