commit 8f0844ee78c1cbc81bd91818fa65e7a6e2a5b51e
author Daniel Sandler <dsandler@android.com> Tue May 25 12:17:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 25 12:17:28 2010 -0700
tree 5a81d34ffb64b0d103510645d661f9e3d04db82b
parent d822fbec460b79bdad7fb33563d85094bdd606fc
parent 3e297b57a0cb06450034a80893b5ede223b33552

am 3e297b57: Merge "Mask bitmap creation errors while dragging shortcuts." into froyo

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index daabbcc..b4f972b 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -163,6 +163,11 @@
 
         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 @@
         }
         v.buildDrawingCache();
         Bitmap cacheBitmap = v.getDrawingCache();
+        if (cacheBitmap == null) {
+            Log.e(TAG, "failed getViewBitmap(" + v + ")", new RuntimeException());
+            return null;
+        }
 
         Bitmap bitmap = Bitmap.createBitmap(cacheBitmap);