LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4 am: 43b1fa710e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I890d00fa46d9623bc7d391379ac9b77b7f33703d
This commit is contained in:
Treehugger Robot
2021-03-12 10:00:17 +00:00
committed by Automerger Merge Worker
parent ed8aca675d 43b1fa710e
commit 3327d66cc8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/android/net/QosSocketInfo.java
View File

@@ -92,7 +92,7 @@ public final class QosSocketInfo implements Parcelable {
Objects.requireNonNull(socket, "socket cannot be null"); Objects.requireNonNull(socket, "socket cannot be null");
mNetwork = Objects.requireNonNull(network, "network cannot be null"); mNetwork = Objects.requireNonNull(network, "network cannot be null");
mParcelFileDescriptor = ParcelFileDescriptor.dup(socket.getFileDescriptor$()); mParcelFileDescriptor = ParcelFileDescriptor.fromSocket(socket);
mLocalSocketAddress = mLocalSocketAddress =
new InetSocketAddress(socket.getLocalAddress(), socket.getLocalPort()); new InetSocketAddress(socket.getLocalAddress(), socket.getLocalPort());
} }