Merge "Avoid NullPointerException in getHandler()"

2013-05-10 19:50:39 +00:00
parent cd1de3940d c6031ab7c8
commit 4754f401a9
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10525,8 +10525,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
     * handler can be used to pump events in the UI events queue.
     */
    public Handler getHandler() {
-        if (mAttachInfo != null) {
-            return mAttachInfo.mHandler;
+        final AttachInfo attachInfo = mAttachInfo;
+        if (attachInfo != null) {
+            return attachInfo.mHandler;
        }
        return null;
    }