commit | d5862b172412b4018f47853c69882789eefa3078 | [log] [tgz] |
---|---|---|
author | Ricky Wai <rickywai@google.com> | Fri Jan 18 15:55:57 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 18 15:55:57 2019 +0000 |
tree | 5378e9184a8116326d7cc0d5e8b954f68744b50f | |
parent | b2a7ad7877a0bfa29bc43e78e14be28ede8cbb66 [diff] | |
parent | 8b45da90254b00cbbb114d03a8c385e690858c25 [diff] |
Merge "Suppress injected launcher activity for apps that are vouched"
diff --git a/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java b/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java index b8175d2..aa1669e 100644 --- a/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java +++ b/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java
@@ -181,4 +181,9 @@ throw new IllegalStateException("WifiNetworkAgentSpecifier should never be used " + "for requests."); } + + @Override + public NetworkSpecifier redact() { + return null; + } }
diff --git a/wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java b/wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java index 1426383..4bee837 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java
@@ -149,6 +149,11 @@ "WifiAwareAgentNetworkSpecifier should not be used in network requests"); } + @Override + public NetworkSpecifier redact() { + return null; + } + private void initialize() { try { mDigester = MessageDigest.getInstance("SHA-256");