Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 7b327e1bef

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b3e8b098eb80098198b1e1cf6c2ce2fe138bc0a
This commit is contained in:
Treehugger Robot
2021-03-12 09:22:33 +00:00
committed by Automerger Merge Worker
parent d41966bca6 7b327e1bef
commit 098ac69976
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Connectivity/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());
} }