| commit | 43b1fa710e3fea78d1d3e0e1d210dce46bc57961 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 12 09:22:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 09:22:33 2021 +0000 |
| tree | 414c15397e2fdcfb8061cc51adfd63d632c1d7eb | |
| parent | 10af6fb50033f21625838c9f8b5eec27d628b1ef [diff] | |
| parent | 0a30c831a4367fc567a9167e64337420a8e04edb [diff] |
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b3e8b098eb80098198b1e1cf6c2ce2fe138bc0a
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()); }