Merge "Guard against battery tile crash" into nyc-dev am: f2bf0c4ba0

am: 58add15bb3 * commit '58add15bb340dc12c2d07e5afd6637a14e209a21': Guard against battery tile crash
2016-03-02 22:43:35 +00:00
parent 8eb253b2f5 58add15bb3
commit 3144393d96
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();