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

2018-07-21 00:59:59 +00:00
parent 228bf4f320 b3a81a1fad
commit 0587bdd59f
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.
        }