commit 56602664f253b40a45e3bb59312ff9e3c6166870
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jun 04 00:21:28 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 04 00:21:28 2022 +0000
tree d93ffd1d7d5782e9d6f7d1993a40fffb370c2864
parent 1457cc5d4d5cfdf2cd764bff9f3d670db0c5d17f
parent aa3c079d2a8b27b5f8173bea0fb6178a283313b0

Merge "HealthServiceWrapperAidl fix NPE" am: aa3c079d2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115401

Change-Id: Ie8523768e133b01d0cde229f09b5a4c6a5582cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/health/HealthServiceWrapperAidl.java

diff --git a/services/core/java/com/android/server/health/HealthServiceWrapperAidl.java b/services/core/java/com/android/server/health/HealthServiceWrapperAidl.java
index 4f2ed68..c411319 100644
--- a/services/core/java/com/android/server/health/HealthServiceWrapperAidl.java
+++ b/services/core/java/com/android/server/health/HealthServiceWrapperAidl.java
@@ -208,7 +208,9 @@
                                 if (Objects.equals(newBinder, oldBinder)) return;
 
                                 Slog.i(TAG, "New health AIDL HAL service registered");
-                                mRegCallback.onRegistration(oldService, newService);
+                                if (mRegCallback != null) {
+                                    mRegCallback.onRegistration(oldService, newService);
+                                }
                             });
         }
     }