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

am: f2bf0c4ba0

* commit 'f2bf0c4ba0a759b05a78ace4cb95c484a050aafe':
  Guard against battery tile crash

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();