Merge "Mask bitmap creation errors while dragging shortcuts." into froyo

This commit is contained in:
Daniel Sandler
2010-05-25 12:10:24 -07:00
committed by Android (Google) Code Review

View File

@@ -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);