From 25d3a437d5ed44d8f719a1eff9dff3eb7fa2b309 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Mon, 25 Jan 2016 13:00:44 -0500
Subject: Fix crash on bug report

Bug: 26766534
Change-Id: I5b76ac8911eef960028cceb40e54f76ea998024a
---
 .../src/com/android/systemui/statusbar/phone/ButtonDispatcher.java    | 4 ++--
 1 file 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) {
-- 
cgit v1.2.3-59-g8ed1b