Merge "Merge "HealthServiceWrapperAidl fix NPE" into tm-dev am: cf94069f81 am: c342eb602a" into tm-d1-dev-plus-aosp

2022-06-04 00:16:51 +00:00
parent 7d9cfc7b26 ebfb345d03
commit 372448979d
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);
+                                }
                            });
        }
    }