Merge "Fix a NPE in BatteryStatsImpl" into pi-dev

am: 0587bdd59f Change-Id: I3bcc5d38995a38f068df6251826050fd59325e80
2018-07-20 21:14:10 -07:00
parent cc8dc1d688 0587bdd59f
commit a31b0cf871
1 changed files with 3 additions and 1 deletions
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -4021,7 +4021,9 @@ public class BatteryStatsImpl extends BatteryStats {
        try {
            IBatteryPropertiesRegistrar registrar = IBatteryPropertiesRegistrar.Stub.asInterface(
                    ServiceManager.getService("batteryproperties"));
-            registrar.scheduleUpdate();
+            if (registrar != null) {
+                registrar.scheduleUpdate();
+            }
        } catch (RemoteException e) {
            // Ignore.
        }