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

Snap for 4710485 from d4a95a168974bf4052f63b9925de9594be684d66 to pi-release

Browse Source 
Change-Id: I240679b58fa328769ae8e0240bcf53676a489ade
This commit is contained in:
android-build-team Robot
2018-04-10 07:27:46 +00:00
parent 07fd7ee69b ecd081f906
commit 3c1d487646
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/IpSecManager.java
View File

@@ -337,6 +337,9 @@ public final class IpSecManager {
*/ */
public void applyTransportModeTransform(@NonNull Socket socket, public void applyTransportModeTransform(@NonNull Socket socket,
@PolicyDirection int direction, @NonNull IpSecTransform transform) throws IOException { @PolicyDirection int direction, @NonNull IpSecTransform transform) throws IOException {
// Ensure creation of FD. See b/77548890 for more details.
socket.getSoLinger();
applyTransportModeTransform(socket.getFileDescriptor$(), direction, transform); applyTransportModeTransform(socket.getFileDescriptor$(), direction, transform);
} }
@@ -441,6 +444,9 @@ public final class IpSecManager {
* @throws IOException indicating that the transform could not be removed from the socket * @throws IOException indicating that the transform could not be removed from the socket
*/ */
public void removeTransportModeTransforms(@NonNull Socket socket) throws IOException { public void removeTransportModeTransforms(@NonNull Socket socket) throws IOException {
// Ensure creation of FD. See b/77548890 for more details.
socket.getSoLinger();
removeTransportModeTransforms(socket.getFileDescriptor$()); removeTransportModeTransforms(socket.getFileDescriptor$());
} }

10
services/core/java/com/android/server/net/NetworkStatsCollection.java
View File

@@ -47,7 +47,7 @@ import android.util.ArrayMap;
import android.util.AtomicFile; import android.util.AtomicFile;
import android.util.IntArray; import android.util.IntArray;
import android.util.MathUtils; import android.util.MathUtils;
import android.util.Pair; import android.util.Range;
import android.util.Slog; import android.util.Slog;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
@@ -266,11 +266,11 @@ public class NetworkStatsCollection implements FileRotator.Reader {
long collectEnd = end; long collectEnd = end;
if (augmentEnd != SubscriptionPlan.TIME_UNKNOWN) { if (augmentEnd != SubscriptionPlan.TIME_UNKNOWN) {
final Iterator<Pair<ZonedDateTime, ZonedDateTime>> it = augmentPlan.cycleIterator(); final Iterator<Range<ZonedDateTime>> it = augmentPlan.cycleIterator();
while (it.hasNext()) { while (it.hasNext()) {
final Pair<ZonedDateTime, ZonedDateTime> cycle = it.next(); final Range<ZonedDateTime> cycle = it.next();
final long cycleStart = cycle.first.toInstant().toEpochMilli(); final long cycleStart = cycle.getLower().toInstant().toEpochMilli();
final long cycleEnd = cycle.second.toInstant().toEpochMilli(); final long cycleEnd = cycle.getUpper().toInstant().toEpochMilli();
if (cycleStart <= augmentEnd && augmentEnd < cycleEnd) { if (cycleStart <= augmentEnd && augmentEnd < cycleEnd) {
augmentStart = cycleStart; augmentStart = cycleStart;
collectStart = Long.min(collectStart, augmentStart); collectStart = Long.min(collectStart, augmentStart);