commit 7864e344b412678fda23ff104713b47ba1e5aecf
author hepengtao <hept.hept.hept@gmail.com> Fri Feb 04 12:54:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 04 12:54:01 2022 +0000
tree b286917be4abb28326b69c2c61ae75d43094a866
parent 9efdbcb6c848784986477167da2ebc0b14ecda33
parent 231587992d29e1ab0d8aeeea8c5d2a9476d30dc7

NSD: Specify on what interface to getAddrInfo am: 271548c96d am: 852ee5ffef am: a9693df3a2 am: 231587992d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1862673

Change-Id: I100de625b5f2eca95a74637effecb1bbc54038a4

service-t/src/com/android/server/NsdService.java

diff --git a/service-t/src/com/android/server/NsdService.java b/service-t/src/com/android/server/NsdService.java
index 497107d..eca4ccf 100644
--- a/service-t/src/com/android/server/NsdService.java
+++ b/service-t/src/com/android/server/NsdService.java
@@ -488,7 +488,7 @@
                         removeRequestMap(clientId, id, clientInfo);
 
                         int id2 = getUniqueId();
-                        if (getAddrInfo(id2, cooked[3])) {
+                        if (getAddrInfo(id2, cooked[3], cooked[7])) {
                             storeRequestMap(clientId, id2, clientInfo, NsdManager.RESOLVE_SERVICE);
                         } else {
                             clientInfo.onResolveServiceFailed(
@@ -833,8 +833,8 @@
         return mDaemon.execute("stop-resolve", resolveId);
     }
 
-    private boolean getAddrInfo(int resolveId, String hostname) {
-        return mDaemon.execute("getaddrinfo", resolveId, hostname);
+    private boolean getAddrInfo(int resolveId, String hostname, String interfaceName) {
+        return mDaemon.execute("getaddrinfo", resolveId, hostname, interfaceName);
     }
 
     private boolean stopGetAddrInfo(int resolveId) {