am 4754f401: Merge "Avoid NullPointerException in getHandler()"

* commit '4754f401a912305e1ceec04b62ad9b9f7d3c2ff6':
  Avoid NullPointerException in getHandler()

1 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 9a94af9a4e32..93cc1912fcb5 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10699,8 +10699,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;
     }