commit bfbf110f164b16475a6ecd52063da83162d51e90
author Tom Taylor <tomtaylor@google.com> Wed Jan 30 10:16:58 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 30 10:16:58 2013 -0800
tree 342b4e8edb8039567e48d6c21200abd44b8785b6
parent 2aa75999ad3da614b2d2eb879c13727b5dce77f7
parent 1ce0de891c0677ff1caf39ac41a2b1572d613f62

am 1ce0de89: am 400659f1: am 2549ff53: Merge "Fix NullPointerException in RecipientsEditor."

# By Bin Li
# Via Android Git Automerger (2) and others
* commit '1ce0de891c0677ff1caf39ac41a2b1572d613f62':
  Fix NullPointerException in RecipientsEditor.

src/com/android/mms/ui/RecipientsEditor.java

diff --git a/src/com/android/mms/ui/RecipientsEditor.java b/src/com/android/mms/ui/RecipientsEditor.java
index 7cbb066..4de2118 100644
--- a/src/com/android/mms/ui/RecipientsEditor.java
+++ b/src/com/android/mms/ui/RecipientsEditor.java
@@ -280,6 +280,13 @@
     }
 
     private int pointToPosition(int x, int y) {
+        // Check layout before getExtendedPaddingTop().
+        // mLayout is used in getExtendedPaddingTop().
+        Layout layout = getLayout();
+        if (layout == null) {
+            return -1;
+        }
+
         x -= getCompoundPaddingLeft();
         y -= getExtendedPaddingTop();
 
@@ -287,11 +294,6 @@
         x += getScrollX();
         y += getScrollY();
 
-        Layout layout = getLayout();
-        if (layout == null) {
-            return -1;
-        }
-
         int line = layout.getLineForVertical(y);
         int off = layout.getOffsetForHorizontal(line, x);