summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-29 12:31:08 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-29 12:31:08 -0700
commit9b8c5b69746d57b77f04d60869f9bbf01d84e858 (patch)
tree082d9ffe942947ca9edc8a77664f152c9fdad739
parent8c5e96fb680fb6a90c07645797c889f785da4696 (diff)
parent9d981343c9d187b4746ed1f3658224d9551d51c8 (diff)
downloadframeworks_base-9b8c5b69746d57b77f04d60869f9bbf01d84e858.zip
frameworks_base-9b8c5b69746d57b77f04d60869f9bbf01d84e858.tar.gz
frameworks_base-9b8c5b69746d57b77f04d60869f9bbf01d84e858.tar.bz2
am 9d981343: Merge change 2732 into donut
Merge commit '9d981343c9d187b4746ed1f3658224d9551d51c8' * commit '9d981343c9d187b4746ed1f3658224d9551d51c8': Fix for #1878497.
-rwxr-xr-xcore/java/android/gesture/Gesture.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/core/java/android/gesture/Gesture.java b/core/java/android/gesture/Gesture.java
index 6aca105..8e71c57 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);
}
/**