From c8d2a142f09ac65030be9223a511308b256846d6 Mon Sep 17 00:00:00 2001
From: Benedict Wong <benedictwong@google.com>
Date: Tue, 27 Mar 2018 17:00:41 -0700
Subject: [PATCH] Update encapSocket API calls to getFileDescriptor

This change updates the getSocket calls to getFileDescriptor, persuant
to new API.

Bug: 72473753
Test: CTS tests run on walleye
Merged-In: I65479cb35c88aee1f65c8597c3382cd30fa8d4a9
Change-Id: I65479cb35c88aee1f65c8597c3382cd30fa8d4a9
(cherry picked from commit 94d33818769cf60b9801b39875f5bc5dff2dc734)
---
 .../net/src/android/net/cts/IpSecManagerTest.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
index 7c09e41878..6a6dd84806 100644
--- a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
@@ -631,7 +631,7 @@ public class IpSecManagerTest extends AndroidTestCase {
         StatsChecker.initStatsChecker();
 
         try (IpSecManager.UdpEncapsulationSocket encapSocket = mISM.openUdpEncapsulationSocket()) {
-            int localPort = getPort(encapSocket.getSocket());
+            int localPort = getPort(encapSocket.getFileDescriptor());
 
             // Append ESP header - 4 bytes of SPI, 4 bytes of seq number
             byte[] dataWithEspHeader = new byte[TEST_DATA.length + 8];
@@ -639,14 +639,14 @@ public class IpSecManagerTest extends AndroidTestCase {
 
             byte[] in = new byte[dataWithEspHeader.length];
             Os.sendto(
-                    encapSocket.getSocket(),
+                    encapSocket.getFileDescriptor(),
                     dataWithEspHeader,
                     0,
                     dataWithEspHeader.length,
                     0,
                     local,
                     localPort);
-            Os.read(encapSocket.getSocket(), in, 0, in.length);
+            Os.read(encapSocket.getFileDescriptor(), in, 0, in.length);
             assertArrayEquals("Encapsulated data did not match.", dataWithEspHeader, in);
 
             int ipHdrLen = local instanceof Inet6Address ? IP6_HDRLEN : IP4_HDRLEN;
@@ -1082,7 +1082,7 @@ public class IpSecManagerTest extends AndroidTestCase {
                 final String message = "Sample IKE Packet";
                 data = (new String(header) + message).getBytes("UTF-8");
                 Os.sendto(
-                        encapSocket.getSocket(),
+                        encapSocket.getFileDescriptor(),
                         data,
                         0,
                         data.length,
@@ -1090,7 +1090,7 @@ public class IpSecManagerTest extends AndroidTestCase {
                         local,
                         encapSocket.getPort());
                 in = new byte[data.length];
-                Os.read(encapSocket.getSocket(), in, 0, in.length);
+                Os.read(encapSocket.getFileDescriptor(), in, 0, in.length);
                 assertTrue(
                         "Encap socket was unable to send/receive IKE data",
                         Arrays.equals(data, in));
@@ -1142,7 +1142,7 @@ public class IpSecManagerTest extends AndroidTestCase {
                 message = "Sample IKE Packet";
                 data = (new String(header) + message).getBytes("UTF-8");
                 Os.sendto(
-                        encapSocket.getSocket(),
+                        encapSocket.getFileDescriptor(),
                         data,
                         0,
                         data.length,
@@ -1157,7 +1157,7 @@ public class IpSecManagerTest extends AndroidTestCase {
                 // Expect an nulled out SPI just as we sent out, without being modified.
                 byte[] in = new byte[4];
                 in[0] = 1; // Make sure the array has to be overwritten to pass
-                Os.read(encapSocket.getSocket(), in, 0, in.length);
+                Os.read(encapSocket.getFileDescriptor(), in, 0, in.length);
                 assertTrue(
                         "Encap socket received UDP-encap-ESP data despite invalid SPIs",
                         Arrays.equals(header, in));