am 3f6c1d2f: am 2dd0767f: Merge "Mms: JAVACRASH in com.android.mms at android.os.AsyncTask.done"

* commit '3f6c1d2f07b7d00fdd1ef1a9383b94ebb9028809':
  Mms: JAVACRASH in com.android.mms at android.os.AsyncTask$3.done

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/mms/model/SlideModel.java b/src/com/android/mms/model/SlideModel.java
index 98c66f0f..48c9d7c1 100644
--- a/src/com/android/mms/model/SlideModel.java
+++ b/src/com/android/mms/model/SlideModel.java
@@ -233,6 +233,9 @@ public class SlideModel extends Model implements List<MediaModel>, EventListener
     public void decreaseSlideSize(int decreaseSize) {
         if (decreaseSize > 0) {
             mSlideSize -= decreaseSize;
+            if (mSlideSize < 0) {
+                mSlideSize = 0;
+            }
         }
     }
 
@@ -252,6 +255,9 @@ public class SlideModel extends Model implements List<MediaModel>, EventListener
         if ((decreaseSize > 0) && (null != mParent)) {
             int size = mParent.getCurrentMessageSize();
             size -= decreaseSize;
+            if (size < 0) {
+                size = 0;
+            }
             mParent.setCurrentMessageSize(size);
         }
     }