commit 3abae23ae2b385f477f8c3ed046228bec00b08d3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 26 07:41:00 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 26 07:41:00 2019 +0000
tree 2eb3dec98c7928866787be2d0d45fa01b8acbe94
parent 6ba53a9b1cc45a6ef585a838242049d202fce379
parent d6edc4157ae7ec4c2f85145b44f7788267039e75

Merge "Remove tlsFingerprints init value" am: f814cdf30e am: e2a9a2aa2b am: d6edc4157a

Change-Id: I07a79a786b6847f49859ca04783effd45043d1f6

services/core/java/com/android/server/connectivity/DnsManager.java

diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/services/core/java/com/android/server/connectivity/DnsManager.java
index 2321afb..5250a77 100644
--- a/services/core/java/com/android/server/connectivity/DnsManager.java
+++ b/services/core/java/com/android/server/connectivity/DnsManager.java
@@ -337,7 +337,6 @@
                               .collect(Collectors.toList()))
                 : useTls ? paramsParcel.servers  // Opportunistic
                 : new String[0];            // Off
-        paramsParcel.tlsFingerprints = new String[0];
         // Prepare to track the validation status of the DNS servers in the
         // resolver config when private DNS is in opportunistic or strict mode.
         if (useTls) {