LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NsdService: test coverage for client requests.

Browse Source 
Adding coverage for:
  - NsdManager client disconnection
  - in-flight request GC

Test: new test passes
Bug: 37013369, 33298084
Bug: 38503832

(cherry picked from commit 4dd4db7720)

Change-Id: I02aca772d88306acae09db739ced7a2b1119b72b
This commit is contained in:
Hugo Benichi
2017-04-28 15:31:10 +09:00
parent fde4caf456
commit c0a215d1ad
2 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/nsd/NsdManager.java
View File

@@ -269,6 +269,14 @@ public final class NsdManager {
init(); init();
} }
/**
* @hide
*/
@VisibleForTesting
public void disconnect() {
mAsyncChannel.disconnect();
}
/** /**
* Failures are passed with {@link RegistrationListener#onRegistrationFailed}, * Failures are passed with {@link RegistrationListener#onRegistrationFailed},
* {@link RegistrationListener#onUnregistrationFailed}, * {@link RegistrationListener#onUnregistrationFailed},

35
services/core/java/com/android/server/NsdService.java
View File

@@ -49,7 +49,6 @@ import com.android.internal.util.DumpUtils;
import com.android.internal.util.Protocol; import com.android.internal.util.Protocol;
import com.android.internal.util.State; import com.android.internal.util.State;
import com.android.internal.util.StateMachine; import com.android.internal.util.StateMachine;
import com.android.server.NativeDaemonConnector.Command;
/** /**
* Network Service Discovery Service handles remote service discovery operation requests by * Network Service Discovery Service handles remote service discovery operation requests by
@@ -155,7 +154,7 @@ public class NsdService extends INsdManager.Stub {
} }
//Last client //Last client
if (mClients.size() == 0) { if (mClients.size() == 0) {
stopMDnsDaemon(); mDaemon.stop();
} }
break; break;
case AsyncChannel.CMD_CHANNEL_FULL_CONNECTION: case AsyncChannel.CMD_CHANNEL_FULL_CONNECTION:
@@ -215,14 +214,14 @@ public class NsdService extends INsdManager.Stub {
public void enter() { public void enter() {
sendNsdStateChangeBroadcast(true); sendNsdStateChangeBroadcast(true);
if (mClients.size() > 0) { if (mClients.size() > 0) {
startMDnsDaemon(); mDaemon.start();
} }
} }
@Override @Override
public void exit() { public void exit() {
if (mClients.size() > 0) { if (mClients.size() > 0) {
stopMDnsDaemon(); mDaemon.stop();
} }
} }
@@ -256,7 +255,7 @@ public class NsdService extends INsdManager.Stub {
//First client //First client
if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL && if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL &&
mClients.size() == 0) { mClients.size() == 0) {
startMDnsDaemon(); mDaemon.start();
} }
return NOT_HANDLED; return NOT_HANDLED;
case AsyncChannel.CMD_CHANNEL_DISCONNECTED: case AsyncChannel.CMD_CHANNEL_DISCONNECTED:
@@ -703,26 +702,13 @@ public class NsdService extends INsdManager.Stub {
return true; return true;
} }
public boolean execute(Command cmd) { public void start() {
if (DBG) { execute("start-service");
Slog.d(TAG, cmd.toString());
}
try {
mNativeConnector.execute(cmd);
} catch (NativeDaemonConnectorException e) {
Slog.e(TAG, "Failed to execute " + cmd, e);
return false;
}
return true;
} }
}
private boolean startMDnsDaemon() { public void stop() {
return mDaemon.execute("start-service"); execute("stop-service");
} }
private boolean stopMDnsDaemon() {
return mDaemon.execute("stop-service");
} }
private boolean registerService(int regId, NsdServiceInfo service) { private boolean registerService(int regId, NsdServiceInfo service) {
@@ -734,8 +720,7 @@ public class NsdService extends INsdManager.Stub {
int port = service.getPort(); int port = service.getPort();
byte[] textRecord = service.getTxtRecord(); byte[] textRecord = service.getTxtRecord();
String record = Base64.encodeToString(textRecord, Base64.DEFAULT).replace("\n", ""); String record = Base64.encodeToString(textRecord, Base64.DEFAULT).replace("\n", "");
Command cmd = new Command("mdnssd", "register", regId, name, type, port, record); return mDaemon.execute("register", regId, name, type, port, record);
return mDaemon.execute(cmd);
} }
private boolean unregisterService(int regId) { private boolean unregisterService(int regId) {