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

Commit 06230562 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... 

Merge "[MS60] Remove TrafficStats.TAG_SYSTEM_APP dependency" am: 6dc2fbcf am: c8e96a46 am: 62658a46 am: 4046bf7c

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

Change-Id: Ie7d35aac370580f5bb20b33c167ba304b6c5ba0a
parents 538db821 4046bf7c

core/java/android/net/PrivateDnsConnectivityChecker.java

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

     */

    public static boolean canConnectToPrivateDnsServer(@NonNull String hostname) {

    public static boolean canConnectToPrivateDnsServer(@NonNull String hostname) {

        final SocketFactory factory = SSLSocketFactory.getDefault();

        final SocketFactory factory = SSLSocketFactory.getDefault();

        TrafficStats.setThreadStatsTag(TrafficStats.TAG_SYSTEM_APP);

        TrafficStats.setThreadStatsTagApp();





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

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

            socket.setSoTimeout(CONNECTION_TIMEOUT_MS);

            socket.setSoTimeout(CONNECTION_TIMEOUT_MS);