summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chad Brubaker <cbrubaker@google.com> 2016-08-09 19:13:00 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-08-09 19:13:01 +0000
commit5b63231a31dbeafc0dfb260b2ebc52f536dc3441 (patch)
tree548d95da7c7291ccb03ebcbb5e9e9326d4f4f58d
parent67aaa079ee0a804696bc80c325684c097de805f5 (diff)
parentbd62098a54017863602f85404624fa174b724e2c (diff)
Merge "Add stub isCTVerificationRequired methods"
-rw-r--r--core/java/android/security/FrameworkNetworkSecurityPolicy.java5
-rw-r--r--core/java/android/security/net/config/ConfigNetworkSecurityPolicy.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/security/FrameworkNetworkSecurityPolicy.java b/core/java/android/security/FrameworkNetworkSecurityPolicy.java
index 83f173ec2938..ee4f871105eb 100644
--- a/core/java/android/security/FrameworkNetworkSecurityPolicy.java
+++ b/core/java/android/security/FrameworkNetworkSecurityPolicy.java
@@ -37,4 +37,9 @@ public class FrameworkNetworkSecurityPolicy extends libcore.net.NetworkSecurityP
public boolean isCleartextTrafficPermitted(String hostname) {
return isCleartextTrafficPermitted();
}
+
+ @Override
+ public boolean isCertificateTransparencyVerificationRequired(String hostname) {
+ return false;
+ }
}
diff --git a/core/java/android/security/net/config/ConfigNetworkSecurityPolicy.java b/core/java/android/security/net/config/ConfigNetworkSecurityPolicy.java
index e7d17c27c2c9..a708f5b57dc9 100644
--- a/core/java/android/security/net/config/ConfigNetworkSecurityPolicy.java
+++ b/core/java/android/security/net/config/ConfigNetworkSecurityPolicy.java
@@ -37,4 +37,9 @@ public class ConfigNetworkSecurityPolicy extends libcore.net.NetworkSecurityPoli
public boolean isCleartextTrafficPermitted(String hostname) {
return mConfig.isCleartextTrafficPermitted(hostname);
}
+
+ @Override
+ public boolean isCertificateTransparencyVerificationRequired(String hostname) {
+ return false;
+ }
}