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>
This commit is contained in:
Treehugger Robot
2022-06-04 00:21:28 +00:00
committed by Automerger Merge Worker

View File

@@ -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);
}
});
}
}