diff options
| author | 2018-12-30 18:00:37 -0800 | |
|---|---|---|
| committer | 2019-01-18 05:24:32 +0000 | |
| commit | 753e63c0f5d306fe90ad253c47caae1d32f96b6e (patch) | |
| tree | 983dd5093b8520866b24110a73e8db7be73c1b55 | |
| parent | 3c3f264c7f62fddf96ccacb07bbdb7d2075e3d9d (diff) | |
[WIFI] Make Aware + Connectivity agent network specifiers sensitive
Configure the Wi-Fi Aware and Wi-Fi connectivity API agent network
specifiers as sensitive. This will strip them out from the
network capabilities before the capabilities are forwarded to the
app.
Necessary since the agent network specifier contains information
which the apps should not have.
Bug: 122160111
Test: atest ConnectivityServiceTest (frameworks/base/tests/net)
Test: atest frameworks/base/tests/net
Test: atest frameworks/opt/net/wifi/tests/wifitests
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks/opt/net/ethernet/tests
Test: atest android.net.cts - some flakiness!
Test: act.py ThroughputTest
Test: act.py DataPathTest
Test: atest SingleDeviceTest (cts)
Change-Id: I9673107a2ee13bca63539fc7dbee7f376af3ebcb
| -rw-r--r-- | wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java | 5 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java b/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java index b8175d2338ec..aa1669ee6d94 100644 --- a/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java +++ b/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java @@ -181,4 +181,9 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements 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 14263830660f..4bee837d6089 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java @@ -149,6 +149,11 @@ public class WifiAwareAgentNetworkSpecifier extends NetworkSpecifier implements "WifiAwareAgentNetworkSpecifier should not be used in network requests"); } + @Override + public NetworkSpecifier redact() { + return null; + } + private void initialize() { try { mDigester = MessageDigest.getInstance("SHA-256"); |