summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2012-04-19 10:00:22 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-04-19 10:00:22 -0700
commit1bf4d5f24e2f958a7045598f9263e6bfc526fbdb (patch)
treeb6e45cca87eeaa8bb13e7c05e49ef000179a6a40
parent75e91f77160e6f48dae780cc58df42a2bc896c1e (diff)
parent0283a5573c0a8b239f88147fe4ecf1b379e2f0a4 (diff)
Merge "Fix crash setting null seekbar thumb"
-rw-r--r--core/java/android/widget/AbsSeekBar.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/AbsSeekBar.java b/core/java/android/widget/AbsSeekBar.java
index ca5648a06ed4..ae68794fa777 100644
--- a/core/java/android/widget/AbsSeekBar.java
+++ b/core/java/android/widget/AbsSeekBar.java
@@ -123,7 +123,7 @@ public abstract class AbsSeekBar extends ProgressBar {
invalidate();
if (needUpdate) {
updateThumbPos(getWidth(), getHeight());
- if (thumb.isStateful()) {
+ if (thumb != null && thumb.isStateful()) {
// Note that if the states are different this won't work.
// For now, let's consider that an app bug.
int[] state = getDrawableState();