Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "HealthServiceWrapperAidl fix NPE" into tm-dev am: cf94069f81

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18732235

Change-Id: I6902c6b3fef9f51d1575bf8344e76c8bd47925ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yifan Hong
2022-06-04 00:15:55 +00:00
committed by Automerger Merge Worker
parent ab37bfe32a cf94069f81
commit 07235e25ff
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/health/HealthServiceWrapperAidl.java
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);
}
});
}
}