From 30f2c7820c30be9797f172184f7f97cbc145f770 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 3 Jun 2022 11:03:25 -0700
Subject: [PATCH] HealthServiceWrapperAidl fix NPE

It is possible that mRegCallback is null. Handle
the case when it is accessed without null check.

The mRegCallback is null because StatsPullAtomService
initializes HealthServiceWrapper with null callback.

Test: TH
Bug: 232899396
Change-Id: I45c4ebca8c5612fdfbab8ffd28b9c2799d74869a
Signed-off-by: Yifan Hong <elsk@google.com>
Merged-In: I45c4ebca8c5612fdfbab8ffd28b9c2799d74869a
---
 .../com/android/server/health/HealthServiceWrapperAidl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/health/HealthServiceWrapperAidl.java b/services/core/java/com/android/server/health/HealthServiceWrapperAidl.java
index 4f2ed68974fa2..c4113198ae1d2 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 @@ class HealthServiceWrapperAidl extends HealthServiceWrapper {
                                 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);
+                                }
                             });
         }
     }