From dd11387e580343cf053df03a955e042f4ee445d7 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 8 Nov 2010 19:56:44 -0800
Subject: [PATCH] Fix typo in manual merge

Change-Id: Idaf98e368e032cfbd7fbe3aa2d965b04eea3f43e
---
 core/java/android/widget/TextView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 4ede4ee3b088e..bdc5014eeb920 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6847,7 +6847,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             return superResult;
         }
 
-        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()
+        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() &&
                 mText instanceof Spannable && mLayout != null) {
             if (hasInsertionController()) {
                 getInsertionController().onTouchEvent(event);