summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2016-01-25 13:00:44 -0500
committer Jason Monk <jmonk@google.com> 2016-01-25 13:00:44 -0500
commit25d3a437d5ed44d8f719a1eff9dff3eb7fa2b309 (patch)
tree85aad597902cd35a53b6208c8f035e202890bbe8
parent313b825fe64aa67a44ab883b791520f2d396aaab (diff)
Fix crash on bug report
Bug: 26766534 Change-Id: I5b76ac8911eef960028cceb40e54f76ea998024a
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
index 8e3886bcb2de..aea9e1e15cd1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
@@ -76,11 +76,11 @@ public class ButtonDispatcher {
}
public int getVisibility() {
- return mVisibility;
+ return mVisibility != null ? mVisibility : View.VISIBLE;
}
public float getAlpha() {
- return mAlpha;
+ return mAlpha != null ? mAlpha : 1;
}
public void setImageDrawable(Drawable drawable) {