From 9ffe1ae56bf495b1ada1e9c1da523db0677d98b7 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Fri, 29 May 2009 12:28:23 -0700
Subject: [PATCH] Fix for #1878497.

Always pre-allocate a gesture's bounding box to avoid possible NPEs.
---
 core/java/android/gesture/Gesture.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/java/android/gesture/Gesture.java b/core/java/android/gesture/Gesture.java
index 6aca105825e81..8e71c5744d41e 100755
--- a/core/java/android/gesture/Gesture.java
+++ b/core/java/android/gesture/Gesture.java
@@ -46,7 +46,7 @@ public class Gesture implements Parcelable {
 
     private static int sGestureCount = 0;
 
-    private RectF mBoundingBox;
+    private final RectF mBoundingBox = new RectF();
 
     // the same as its instance ID
     private long mGestureID;
@@ -83,12 +83,7 @@ public class Gesture implements Parcelable {
      */
     public void addStroke(GestureStroke stroke) {
         mStrokes.add(stroke);
-
-        if (mBoundingBox == null) {
-            mBoundingBox = new RectF(stroke.boundingBox);
-        } else {
-            mBoundingBox.union(stroke.boundingBox);
-        }
+        mBoundingBox.union(stroke.boundingBox);
     }
 
     /**