Return ServiceSpecificException from Netd mdns service am: 4dfee3b0bb am: 44b29f6b9d am: de3132a9c0

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2846315

Change-Id: Ic4dfea4b55a02d4159284bce00865e7e5072edbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 31 insertions, 9 deletions

diff --git a/server/MDnsService.cpp b/server/MDnsService.cpp
index d2851754..0c55e7ae 100644
--- a/server/MDnsService.cpp
+++ b/server/MDnsService.cpp
@@ -39,39 +39,61 @@ status_t MDnsService::start() {
 }
 
 binder::Status MDnsService::startDaemon() {
-    DEPRECATED;
+    // TODO(b/298594687): switch from EX_SERVICE_SPECIFIC to DEPRECATED when tethering module
+    // for 2024-02 release is fully rolled out and prebuilt updated in AP1A.xxxxxx.yy build.
+    // Return EX_SERVICE_SPECIFIC for short-term only because callers in tethering module do not
+    // catch the EX_UNSUPPORTED_OPERATION. It will throw an exception and cause a fatal exception.
+    // The EX_UNSUPPORTED_OPERATION has been catched in tethering module since 2024-02 release.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 binder::Status MDnsService::stopDaemon() {
-    DEPRECATED;
+    // TODO(b/298594687): switch to DEPRECATED.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 binder::Status MDnsService::registerService(const RegistrationInfo&) {
-    DEPRECATED;
+    // TODO(b/298594687): switch to DEPRECATED.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 binder::Status MDnsService::discover(const DiscoveryInfo&) {
-    DEPRECATED;
+    // TODO(b/298594687): switch to DEPRECATED.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 binder::Status MDnsService::resolve(const ResolutionInfo&) {
-    DEPRECATED;
+    // TODO(b/298594687): switch to DEPRECATED.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 binder::Status MDnsService::getServiceAddress(const GetAddressInfo&) {
-    DEPRECATED;
+    // TODO(b/298594687): switch to DEPRECATED.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 binder::Status MDnsService::stopOperation(int32_t) {
-    DEPRECATED;
+    // TODO(b/298594687): switch to DEPRECATED.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 binder::Status MDnsService::registerEventListener(const android::sp<IMDnsEventListener>&) {
-    DEPRECATED;
+    // TODO(b/298594687): switch to DEPRECATED.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 binder::Status MDnsService::unregisterEventListener(const android::sp<IMDnsEventListener>&) {
-    DEPRECATED;
+    // TODO(b/298594687): switch to DEPRECATED.
+    return binder::Status::fromExceptionCode(binder::Status::EX_SERVICE_SPECIFIC);
+    // DEPRECATED;
 }
 
 }  // namespace android::net