commit 05dc3fcb9feff85db5b97ae4a45abbbf82d995e2
author 高艳龙 <gaoyl1997@thundersoft.com> Thu Sep 24 19:03:19 2015 +0800
committer Gerrit Code Review <scmadmin@thundersoft.com> Thu Sep 24 19:03:20 2015 +0800
tree d9aa0d62233f4b6c24c4813505e24d22d98bf8c3
parent 946191bf64de05c8c3ec45e6eb24bfffec51ee06
parent 035cefa927e76bda9aa0528333a2a72f72803dc0

Merge "FP2-1321:[ST_2][Monkey] 'com.android.systemui' crash once." into fp2-dev-v2

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index 6dcbed6..5490e1b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -897,8 +897,12 @@
             }
             case MotionEvent.ACTION_POINTER_UP:
                 onSecondaryPointerUp(ev);
-                mLastMotionY = (int) ev.getY(ev.findPointerIndex(mActivePointerId));
-                mDownX = (int) ev.getX(ev.findPointerIndex(mActivePointerId));
+                try{
+                    mLastMotionY = (int) ev.getY(ev.findPointerIndex(mActivePointerId));
+                    mDownX = (int) ev.getX(ev.findPointerIndex(mActivePointerId));
+                }catch(IllegalArgumentException e){
+                    e.printStackTrace();
+                }
                 break;
         }
         return true;