Merge "Fix an NPE in BatteryService" into sc-dev

2021-03-12 19:59:33 +00:00
parent ed432c41d9 780ca87adc
commit 884614ff76
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/BatteryService.java
+++ b/services/core/java/com/android/server/BatteryService.java
@@ -1595,6 +1595,8 @@ public final class BatteryService extends SystemService {
                            if (Objects.equals(newService, oldService)) return;

                            Slog.i(TAG, "health: new instance registered " + mInstanceName);
+                            // #init() may be called with null callback. Skip null callbacks.
+                            if (mCallback == null) return;
                            mCallback.onRegistration(oldService, newService, mInstanceName);
                        } catch (NoSuchElementException | RemoteException ex) {
                            Slog.e(TAG, "health: Cannot get instance '" + mInstanceName