Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62658a46 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[MS60] Remove TrafficStats.TAG_SYSTEM_APP dependency" am: 6dc2fbcf am: c8e96a46 

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

Change-Id: I0156271911c12dfd90000cc98fea4bb5edcad9bd
parents b4a3f380 c8e96a46

core/java/android/net/PrivateDnsConnectivityChecker.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class PrivateDnsConnectivityChecker { 
     */

    public static boolean canConnectToPrivateDnsServer(@NonNull String hostname) {

        final SocketFactory factory = SSLSocketFactory.getDefault();

        TrafficStats.setThreadStatsTag(TrafficStats.TAG_SYSTEM_APP);

        TrafficStats.setThreadStatsTagApp();



        try (SSLSocket socket = (SSLSocket) factory.createSocket()) {

            socket.setSoTimeout(CONNECTION_TIMEOUT_MS);