| commit | 589d936fa847df54f1d76e58d823922735c2f075 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 12 10:43:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 10:43:59 2021 +0000 |
| tree | 9e9abba28ac5b60785a5346e8625e07e82f621af | |
| parent | 1931a317723413e600f1667b02cf34b4855e5921 [diff] | |
| parent | 3327d66cc88ef676f1b12e44de086a4641126e16 [diff] |
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4 am: 43b1fa710e am: 3327d66cc8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I446cca57e6841c923ea89ce8f8eddfd1b8e60b79
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()); }