Merge "HealthServiceWrapperAidl fix NPE" into tm-dev

2022-06-03 23:32:32 +00:00
parent 8df521fb73 30f2c7820c
commit cf94069f81
1 changed files with 3 additions and 1 deletions
--- 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);
+                                }
                            });
        }
    }