diff options
| author | 2022-11-22 18:42:38 +0000 | |
|---|---|---|
| committer | 2022-11-22 18:42:38 +0000 | |
| commit | ac2bc826a50c692893deb8f42431104ee20fe218 (patch) | |
| tree | 087670825f1c5689cfde8156b86389445d7c83c3 /libs/fakeservicemanager/ServiceManager.cpp | |
| parent | 2edd3885544a92bdd9154f1fbb5a45a0f24d479c (diff) | |
| parent | 0ba22cbbe851ddd589dfab3707a00c799b463697 (diff) | |
fakeservicemanager: Don't accept null binders for addService am: 5f6ded8825 am: 0ba22cbbe8
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2308644
Change-Id: I8ff7eeab48f6a8c87a5aa8cb5516dce5277e386d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/fakeservicemanager/ServiceManager.cpp')
| -rw-r--r-- | libs/fakeservicemanager/ServiceManager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/fakeservicemanager/ServiceManager.cpp b/libs/fakeservicemanager/ServiceManager.cpp index 480ec79725..deba724c4f 100644 --- a/libs/fakeservicemanager/ServiceManager.cpp +++ b/libs/fakeservicemanager/ServiceManager.cpp @@ -36,6 +36,9 @@ sp<IBinder> ServiceManager::checkService( const String16& name) const { status_t ServiceManager::addService(const String16& name, const sp<IBinder>& service, bool /*allowIsolated*/, int /*dumpsysFlags*/) { + if (service == nullptr) { + return UNEXPECTED_NULL; + } mNameToService[name] = service; return NO_ERROR; } |