Merge "Fix a NPE in BatteryStatsImpl"

2018-06-30 01:50:19 +00:00
parent 082c201438 31cdfb401d
commit c984df9763
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
@@ -4034,7 +4034,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.
        }