diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-05-31 16:57:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-31 16:57:55 -0700 |
| commit | 38fd7cde0bf51f5372c829713ab8578af941fd36 (patch) | |
| tree | 8a2fca9c1e89efcea7bc5f36f23aa511a77207f3 /core/java/android | |
| parent | 85284fbca7eeaa40c818e21c2ac748c8917bdbd8 (diff) | |
| parent | 83fa41b06e0180d4e86c16f7cb6ae2439183fda8 (diff) | |
| download | frameworks_base-38fd7cde0bf51f5372c829713ab8578af941fd36.zip frameworks_base-38fd7cde0bf51f5372c829713ab8578af941fd36.tar.gz frameworks_base-38fd7cde0bf51f5372c829713ab8578af941fd36.tar.bz2 | |
Merge "Fix TextView potential NPE in isLayoutRtl()"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/TextView.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 9ec3a26..18c3b24 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); } |