| commit | dc1cc867a487e1650c5e56d2a822985a1b375656 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 21 04:21:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 21 04:21:55 2023 +0000 |
| tree | 504746f6b41c31e5f87bcb8092ddb19014974755 | |
| parent | d70cdf6bb7823d78f962ae6eaf287936bd71b792 [diff] | |
| parent | f1e99464ce268809450319fcc3e85306a24e84e6 [diff] |
Merge "Fix typo in ProviderInfo" am: b3e210a9c2 am: f1e99464ce Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2434538 Change-Id: I0a349737bc6d4b7486b4c7460ca44dba16491167 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp index 2c035de..d05e235 100644 --- a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp +++ b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
@@ -293,7 +293,7 @@ if (link != STATUS_OK) { ALOGW("%s: Unable to link to provider '%s' death notifications", __FUNCTION__, mProviderName.c_str()); - mManager->removeProvider(mProviderName); + mManager->removeProvider(mProviderInstance); return nullptr; }
diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp index 1df6ec4..15aa5a5 100644 --- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp +++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
@@ -388,7 +388,7 @@ __FUNCTION__, mProviderName.c_str(), linked.description().c_str()); - mManager->removeProvider(mProviderName); + mManager->removeProvider(mProviderInstance); return nullptr; } else if (!linked) { ALOGW("%s: Unable to link to provider '%s' death notifications",