diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-05-25 12:10:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-25 12:10:24 -0700 |
| commit | 3e297b57a0cb06450034a80893b5ede223b33552 (patch) | |
| tree | a27955b318d72474784ec4b91a8fd4ffbb4ac85b /src | |
| parent | cdc4973136e57d874ad826c7138289a23513ce90 (diff) | |
| parent | 3f8175a86e24b3568d1f5b12e1d3d5efcc57d691 (diff) | |
| download | android_packages_apps_Trebuchet-3e297b57a0cb06450034a80893b5ede223b33552.tar.gz android_packages_apps_Trebuchet-3e297b57a0cb06450034a80893b5ede223b33552.tar.bz2 android_packages_apps_Trebuchet-3e297b57a0cb06450034a80893b5ede223b33552.zip | |
Merge "Mask bitmap creation errors while dragging shortcuts." into froyo
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/DragController.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index daabbcc4c..b4f972bb2 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -163,6 +163,11 @@ public class DragController { Bitmap b = getViewBitmap(v); + if (b == null) { + // out of memory? + return; + } + int[] loc = mCoordinatesTemp; v.getLocationOnScreen(loc); int screenX = loc[0]; @@ -249,6 +254,10 @@ public class DragController { } v.buildDrawingCache(); Bitmap cacheBitmap = v.getDrawingCache(); + if (cacheBitmap == null) { + Log.e(TAG, "failed getViewBitmap(" + v + ")", new RuntimeException()); + return null; + } Bitmap bitmap = Bitmap.createBitmap(cacheBitmap); |