From 83fa41b06e0180d4e86c16f7cb6ae2439183fda8 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Tue, 31 May 2011 16:12:38 -0700
Subject: Fix TextView potential NPE in isLayoutRtl()

- test if mDrawables can be null
- see bug #4517017 (was seen with Monkeys)

Change-Id: I07f04c88a238d1cae6fe89b0ab56fc2c456b8534
---
 core/java/android/widget/TextView.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'core/java/android')

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index a73a6cf..34f748a 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4144,10 +4144,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     @Override
     public boolean isLayoutRtl(Drawable who) {
         if (who == null) return false;
-        final TextView.Drawables drawables = mDrawables;
-        if (who == drawables.mDrawableLeft || who == drawables.mDrawableRight ||
-            who == drawables.mDrawableTop || who == drawables.mDrawableBottom) {
-            return isLayoutRtl();
+        if (mDrawables != null) {
+            final Drawables drawables = mDrawables;
+            if (who == drawables.mDrawableLeft || who == drawables.mDrawableRight ||
+                who == drawables.mDrawableTop || who == drawables.mDrawableBottom) {
+                return isLayoutRtl();
+            }
         }
         return super.isLayoutRtl(who);
     }
-- 
cgit v1.1