Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "InetDiagSocketTest: enable UDP unit tests on all devices"

Browse Source
This commit is contained in:
Treehugger Robot
2018-09-29 00:16:11 +00:00
committed by Gerrit Code Review
parent e6607763b2 f5dfad4b88
commit 23a73be430
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/net/java/android/net/netlink/InetDiagSocketTest.java
View File

@@ -69,17 +69,12 @@ public class InetDiagSocketTest {
private ConnectivityManager mCm;
private Context mContext;
private final static int SOCKET_TIMEOUT_MS = 100;
private boolean mInetDiagUdpEnabled;
@Before
public void setUp() throws Exception {
Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
mContext = instrumentation.getTargetContext();
mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
int expectedUid = Process.myUid();
UdpConnection udp = new UdpConnection("127.0.0.1", "127.0.0.2");
int uid = mCm.getConnectionOwnerUid(udp.protocol, udp.local, udp.remote);
mInetDiagUdpEnabled = (uid == expectedUid);
}
private class Connection {
@@ -187,11 +182,6 @@ public class InetDiagSocketTest {
checkConnectionOwnerUid(tcp.protocol, tcp.local, new InetSocketAddress(0), false);
tcp.close();
/**
* TODO: STOPSHIP: Always test for UDP, do not allow opt-out.
*/
if (!mInetDiagUdpEnabled) return;
/**
* For UDP connections, either a complete match {protocol, local, remote} or a
* partial match {protocol, local} should return a valid UID.