commit 61c0b1a6f5f342db1a1971806075149fa31375b2
author Remi NGUYEN VAN <reminv@google.com> Tue Mar 09 23:53:55 2021 +0000
committer Remi NGUYEN VAN <reminv@google.com> Tue Mar 09 23:54:03 2021 +0000
tree 837286f9b124c64bb9de4d234b7436425c7a4099
parent e2e358f666184bd706c05c9fcf913cf2a31a24b1

Use ParcelDescriptor.fromSocket instead of getFileDescriptor

Socket.getFileDescriptor$ is a hidden API. Instead, replace it with
ParcelDescriptor.fromSocket, which was created to handle such use-cases.

Bug: 170598012
Change-Id: I9e218e4ec29d2b7fe5d2faeb1c2e1cafc63dc923
Test: m

framework/src/android/net/QosSocketInfo.java

diff --git a/framework/src/android/net/QosSocketInfo.java b/framework/src/android/net/QosSocketInfo.java
index d37c469..3bf700b 100644
--- a/framework/src/android/net/QosSocketInfo.java
+++ b/framework/src/android/net/QosSocketInfo.java
@@ -92,7 +92,7 @@
         Objects.requireNonNull(socket, "socket cannot be null");
 
         mNetwork = Objects.requireNonNull(network, "network cannot be null");
-        mParcelFileDescriptor = ParcelFileDescriptor.dup(socket.getFileDescriptor$());
+        mParcelFileDescriptor = ParcelFileDescriptor.fromSocket(socket);
         mLocalSocketAddress =
                 new InetSocketAddress(socket.getLocalAddress(), socket.getLocalPort());
     }