diff options
| author | George Mount <mount@google.com> | 2015-04-03 14:13:43 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2015-04-03 14:13:43 -0700 |
| commit | db22741540a8e838c1aabe57e9790c8dd97687c7 (patch) | |
| tree | 8d66e98fcecc516448380a0fa319fc459d42104c | |
| parent | ec3c97d27f2a424fa847561a3932a40c093a91a1 (diff) | |
| download | frameworks_base-db22741540a8e838c1aabe57e9790c8dd97687c7.zip frameworks_base-db22741540a8e838c1aabe57e9790c8dd97687c7.tar.gz frameworks_base-db22741540a8e838c1aabe57e9790c8dd97687c7.tar.bz2 | |
Fix NPE in getForegroundTintList
Bug 20068789
Change-Id: I658c6f4504ca78ea839d635f497c48c35e1de6ca
| -rw-r--r-- | core/java/android/view/View.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 384bd2c..4f91c55 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -16918,7 +16918,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @Nullable public ColorStateList getForegroundTintList() { return mForegroundInfo != null && mForegroundInfo.mTintInfo != null - ? mBackgroundTint.mTintList : null; + ? mForegroundInfo.mTintInfo.mTintList : null; } /** |
