diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-30 01:50:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-30 01:50:19 +0000 |
| commit | c984df9763ece2fee2cee33235ddb6a6675ea831 (patch) | |
| tree | e907e8c716cf5392c318c9dbf593b83ce4ea6389 /core/java | |
| parent | 082c2014384e1ddf1b9360d3a8b1c6691e875cec (diff) | |
| parent | 31cdfb401da53bec41a020f300c8f10dd7733290 (diff) | |
Merge "Fix a NPE in BatteryStatsImpl"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 31c271e655ec..79d2570256fd 100644 --- 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. } |