commit 1c5aa9cb5d7969ca1610a5566a64e912b2fd8724
author Pawan Wagh <waghpawan@google.com> Tue Jan 10 21:51:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 10 21:51:05 2023 +0000
tree edc0c686183ba579c8d4905fabfc370765fedf4b
parent 71bf41ef5e7edb8bc8b01390cf4344a17b1e162f
parent 396171846d20198bada9dd3b80af8a5c96244e45

Merge "Use actual consumed buffer length to call AParcel_unmarshal"

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 28369d6..e70a98d 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -517,6 +517,7 @@
     visibility: [
         ":__subpackages__",
         "//packages/modules/Virtualization:__subpackages__",
+        "//device/google/cuttlefish/shared/minidroid:__subpackages__",
     ],
 }
 

libs/binder/include/binder/IServiceManager.h

diff --git a/libs/binder/include/binder/IServiceManager.h b/libs/binder/include/binder/IServiceManager.h
index 2af512e..c78f870 100644
--- a/libs/binder/include/binder/IServiceManager.h
+++ b/libs/binder/include/binder/IServiceManager.h
@@ -198,7 +198,10 @@
 {
     const sp<IServiceManager> sm = defaultServiceManager();
     if (sm != nullptr) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         *outService = interface_cast<INTERFACE>(sm->getService(name));
+#pragma clang diagnostic pop // getService deprecation
         if ((*outService) != nullptr) return NO_ERROR;
     }
     return NAME_NOT_FOUND;