Merge "Fix crash on bug report"

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) {