Merge "Guard against battery tile crash" into nyc-dev

2016-03-02 21:08:11 +00:00
parent 25b86cca0f 2462a50e8f
commit f2bf0c4ba0
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java
@@ -182,6 +182,9 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll
        }

        private void bindView() {
+            if (mCurrentView == null) {
+                return;
+            }
            mDrawable.onBatteryLevelChanged(100, false, false);
            mDrawable.onPowerSaveChanged(true);
            mDrawable.disableShowPercent();