Commit graph

10,314 commits

Message SHA1
[automerger skipped] Merge "Update DnsManagerTest for AIDL interface change" am: 9f725d606a am: 4454ba73ff -s ours am: 1333cd91aa -s ours
am skip reason: Change-Id Ic53f42b968626294c851dac252a70769846ba427 with SHA-1 bfce3bc8e3 is in history

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

Change-Id: Idcf69400cac750cd32c7f237219f30c3e7d528d7

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 17:04:59 +00:00
b09cb5f69f
[automerger skipped] Merge "Update DnsManagerTest for AIDL interface change" am: 9f725d606a am: 4454ba73ff -s ours
am skip reason: Change-Id Ic53f42b968626294c851dac252a70769846ba427 with SHA-1 bfce3bc8e3 is in history

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

Change-Id: I89da68283cb71ce1ee25734d481fa24f966f2042

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 16:47:23 +00:00
1333cd91aa
Merge "Update DnsManagerTest for AIDL interface change" am: 9f725d606a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345375

Change-Id: Ic9836cb0ca7ad9e97b7edb135dbb1f8269f4a0df

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 15:50:00 +00:00
4454ba73ff
Merge "Update DnsManagerTest for AIDL interface change"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-06-22 15:31:54 +00:00
9f725d606a
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6 am: 39f6071057
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238

Change-Id: I51cac9db3810fe5d799cd83449268ae0fee07ca2

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 15:30:31 +00:00
39e249d506
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6 am: 4a5922b7e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238

Change-Id: Ic78fb4953e71ea754cba33348cdae0a0d62e75d8

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 15:19:36 +00:00
e6da8ac742
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238

Change-Id: I42c1a772b91c72c420a73e83d41f6f7769a1f972

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 15:18:54 +00:00
39f6071057
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238

Change-Id: I1327794e6b8201d3c47c39838cfa516812cf273d

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 15:18:45 +00:00
4a5922b7e0
Update DnsManagerTest for AIDL interface change
Check one more parameter enforceDnsUid in ResolverOptionsParcel in
DnsManagerTest.

Bug: 159587277
Test: atest
com.android.server.connectivity.DnsManagerTest#testSendDnsConfiguration

Change-Id: Ic53f42b968626294c851dac252a70769846ba427
Merged-In: Ic53f42b968626294c851dac252a70769846ba427

Ken Chen   authored and   Lorenzo Colitti   commited 2020-06-22 15:10:12 +00:00
a523111101
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-06-22 15:09:54 +00:00
f6aeae7ca6
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: 160850d48d -s ours am: 2b971ed1c1 -s ours
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 276e3eb5f3 is in history

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

Change-Id: Ifed6a7754342dd88b38832fb188876a77a733af1

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 14:41:25 +00:00
9268e28f4d
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: 160850d48d am: 5500673334 -s ours
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 d0e4221f64 is in history

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

Change-Id: I8c007e82bb1f6c53c98678f2c3667dc615fdb6ac

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 14:41:14 +00:00
96df2b115f
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: 160850d48d -s ours
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 d0e4221f64 is in history

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

Change-Id: I8c9e94f26b3fd0d72e718fc39d5047604b741868

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 14:28:08 +00:00
2b971ed1c1
Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: 160850d48d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428

Change-Id: Icb40fc91833cdcfb3c79303e4f08cabd60343242

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-22 14:27:54 +00:00
5500673334
Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-06-22 14:15:40 +00:00
160850d48d
Update DnsManagerTest for AIDL interface change
Check one more parameter enforceDnsUid in ResolverOptionsParcel in
DnsManagerTest.

Bug: 159587277
Test: atest
com.android.server.connectivity.DnsManagerTest#testSendDnsConfiguration

Change-Id: Ic53f42b968626294c851dac252a70769846ba427

Ken Chen   commited 2020-06-22 21:44:07 +08:00
bfce3bc8e3
Merge "Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 500ee9a7b3 am: f34bce56fe" into rvc-d1-dev-plus-aosp
Automerger Merge Worker   authored and   Android (Google) Code Review   commited 2020-06-22 09:31:03 +00:00
e4b1104ef5
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 500ee9a7b3 am: 75616e28f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938

Change-Id: If732f439bea2786cd681fd2716f981e9f11175b4

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-06-22 09:30:53 +00:00
b1302870f0
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 500ee9a7b3 am: f34bce56fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938

Change-Id: I81f54b3251ded57e4c03693e405bf1916a3fdf34

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-06-22 09:30:49 +00:00
d80b2624fc
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 500ee9a7b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938

Change-Id: I0ce82679bf81e3c58fed12943b7c9ca9d449fb7f

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-06-22 09:14:15 +00:00
75616e28f6
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 500ee9a7b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938

Change-Id: Ibdf37115a43d5ebbc4e34b5668351916ee5671d1

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-06-22 09:13:55 +00:00
f34bce56fe
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2020-06-22 09:00:25 +00:00
500ee9a7b3
Support DNS-over-TLS probes in NetworkDiagnostics
Probe DNS servers to see they support DNS-over-TLS. Use system
CAs to verify whether the certificates sent by DNS servers are
trusted or not. An error is thrown to cause the probe failed if
DNS servers send untrusted certificates.

Unlike the DnsResolver which doesn't verify the certificates
in opportunistic mode, all of the DoT probes from NetworkDiagnostics
check certificates.

DoT probes apply to the DNS servers gotten from LinkProperties
and the DoT servers gotten from PrivateDnsConfig whatever private
DNS mode is.

A common example in DNS strict mode:
.  DNS TLS dst{8.8.8.8} hostname{dns.google} src{192.168.43.2:48436} qtype{1} qname{815149-android-ds.metric.gstatic.com}: SUCCEEDED: 1/1 NOERROR (432ms)
F  DNS TLS dst{192.168.43.144} hostname{}: FAILED: java.net.ConnectException: failed to connect to /192.168.43.144 (port 853) from /192.168.43.2 (port 41770) after 2500ms: isConnected failed: ECONNREFUSED (Connection refused) (172ms)
.  DNS TLS dst{8.8.4.4} hostname{dns.google} src{192.168.43.2:37598} qtype{1} qname{759312-android-ds.metric.gstatic.com}: SUCCEEDED: 1/1 NOERROR (427ms)

An example when the CA is not trusted:
F  DNS TLS dst{8.8.8.8} hostname{dns.google}: FAILED: javax.net.ssl.SSLHandshakeException: java.security.cert.CertPathValidatorException: Trust anchor for certification path not found. (16ms)

An example when TCP/TLS handshake timeout:
F  DNS TLS dst{8.8.8.8} hostname{dns.google}: FAILED: java.net.SocketTimeoutException: failed to connect to /8.8.8.8 (port 853) from /192.168.2.108 (port 45680) after 2500ms (2514ms)

Bug: 132925257
Bug: 118369977
Test: atest FrameworksNetTests
Original-Change: https://android-review.googlesource.com/1011670
Merged-In: I1b54abed0e931ca4b8a97149459cde54da1c3d6f
Change-Id: I1b54abed0e931ca4b8a97149459cde54da1c3d6f

Mike Yu   commited 2020-06-22 08:57:49 +00:00
276e3eb5f3
Make PendingIntent immutable and correct Settings package name
ConnectivityService puts up some notifications with pending
intents, but these pending intents are mutable that content can
be changed by someone. So make these pending intents to be
immutable.

Some OEMs have their own Settings package. Thus, need to get the
current using Settings package name instead of just use default
name "com.android.settings".

Bug: 154928507
Test: atest FrameworksNetTests
Change-Id: I02e3277358623400aa03dc8996af3d7c46a8ce76

paulhu   commited 2020-06-22 15:32:01 +08:00
70aed281f1
Merge "Support DNS-over-TLS probes in NetworkDiagnostics" am: 64ffa1762f am: d7b0b95a3a am: cd9f6754d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1011670

Change-Id: Ib9a029adad8e0a64cc57b95a902d5dad04cb489a

Mike Yu   authored and   Automerger Merge Worker   commited 2020-06-22 07:12:01 +00:00
929e39a37d
Merge "Support DNS-over-TLS probes in NetworkDiagnostics" am: 64ffa1762f am: d7b0b95a3a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1011670

Change-Id: I25a06623d87e6971a9dac73bdea82a78fd6124d6

Mike Yu   authored and   Automerger Merge Worker   commited 2020-06-22 06:56:39 +00:00
cd9f6754d6
Merge "Support DNS-over-TLS probes in NetworkDiagnostics" am: 64ffa1762f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1011670

Change-Id: I9e436446179750315be45ddc034cece5afd3c004

Mike Yu   authored and   Automerger Merge Worker   commited 2020-06-22 06:45:25 +00:00
d7b0b95a3a
Support DNS-over-TLS probes in NetworkDiagnostics
Probe DNS servers to see they support DNS-over-TLS. Use system
CAs to verify whether the certificates sent by DNS servers are
trusted or not. An error is thrown to cause the probe failed if
DNS servers send untrusted certificates.

Unlike the DnsResolver which doesn't verify the certificates
in opportunistic mode, all of the DoT probes from NetworkDiagnostics
check certificates.

DoT probes apply to the DNS servers gotten from LinkProperties
and the DoT servers gotten from PrivateDnsConfig whatever private
DNS mode is.

A common example in DNS strict mode:
.  DNS TLS dst{8.8.8.8} hostname{dns.google} src{192.168.43.2:48436} qtype{1} qname{815149-android-ds.metric.gstatic.com}: SUCCEEDED: 1/1 NOERROR (432ms)
F  DNS TLS dst{192.168.43.144} hostname{}: FAILED: java.net.ConnectException: failed to connect to /192.168.43.144 (port 853) from /192.168.43.2 (port 41770) after 2500ms: isConnected failed: ECONNREFUSED (Connection refused) (172ms)
.  DNS TLS dst{8.8.4.4} hostname{dns.google} src{192.168.43.2:37598} qtype{1} qname{759312-android-ds.metric.gstatic.com}: SUCCEEDED: 1/1 NOERROR (427ms)

An example when the CA is not trusted:
F  DNS TLS dst{8.8.8.8} hostname{dns.google}: FAILED: javax.net.ssl.SSLHandshakeException: java.security.cert.CertPathValidatorException: Trust anchor for certification path not found. (16ms)

An example when TCP/TLS handshake timeout:
F  DNS TLS dst{8.8.8.8} hostname{dns.google}: FAILED: java.net.SocketTimeoutException: failed to connect to /8.8.8.8 (port 853) from /192.168.2.108 (port 45680) after 2500ms (2514ms)

Bug: 132925257
Bug: 118369977
Test: atest FrameworksNetTests
Change-Id: I1b54abed0e931ca4b8a97149459cde54da1c3d6f

Mike Yu   commited 2020-06-20 16:22:35 +08:00
d0e4221f64
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: af3d08be80 am: 6a262c60cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I2ec211557839533327cc747857a09bd323654ad6

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-06-19 01:22:47 +00:00
db1ba860bd
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: af3d08be80 am: edadfcfae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I17459fc7a4239b10b6b55412d126557719e1bd98

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-06-19 01:22:28 +00:00
d1819c064d
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: af3d08be80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Icd141a992c46290c74929785e261a1cd57bc001b

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-06-19 01:08:48 +00:00
edadfcfae1
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: af3d08be80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Ia5028f7dfeadbcf928efb9862b481c82e2849e18

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-06-19 01:08:47 +00:00
6a262c60cc
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-06-19 00:49:29 +00:00
af3d08be80
Merge "Move DnsPacket to libs net" into rvc-dev am: 271db73395 am: e27a74e2a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: I3f1edfe442f3408a19c9a901fb35bde8ef22950b

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-06-18 15:02:30 +00:00
3e7c015b17
Merge "Move DnsPacket to libs net" into rvc-dev am: 271db73395
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: I74cac5c415d8b3447b57cda7cba1caa215e84ea2

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-06-18 14:58:19 +00:00
e27a74e2a9
Merge "Disable sockets and DNS if process lacks INTERNET permission." into rvc-dev am: aef7a1fd4b am: 1dbc48411d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881939

Change-Id: I6631692e31afe751c89b5647ca51cca288b5b329

Luke Huang   authored and   Automerger Merge Worker   commited 2020-06-18 14:46:29 +00:00
7236208130
Merge "Disable sockets and DNS if process lacks INTERNET permission." into rvc-dev am: aef7a1fd4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881939

Change-Id: I10202dc784bafa044a04546d0a765370331223dc

Luke Huang   authored and   Automerger Merge Worker   commited 2020-06-18 14:46:02 +00:00
1dbc48411d
[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: 11b31c573f am: 5128c3fadd -s ours
am skip reason: Change-Id Ic979dad73983d722365849fbfb0becfd432b894c with SHA-1 532a94a4fe is in history

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

Change-Id: I5351565ef7b11ebc95ddb99b60bba34b9793bfaa

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-18 14:38:58 +00:00
751bbb10b4
[automerger skipped] Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f56147 am: b321060a49 -s ours
am skip reason: Change-Id I57987233d42a0253eaee2e1ca5f28728c2354620 with SHA-1 ebf6ab4c34 is in history

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

Change-Id: Ic398329038eb9e91f6ad9676865448f7317edeef

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-18 14:35:54 +00:00
0a790fb94d
Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: 11b31c573f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869883

Change-Id: I84b0010488024aa9867ad4af7a4013854cdeeaa1

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-18 14:34:45 +00:00
5128c3fadd
Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f56147
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882397

Change-Id: I4c96f81ba9118b545b69eb507333f09ea634bdf8

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-06-18 14:29:52 +00:00
b321060a49
Merge "Address comments from aosp/1298476" am: 6dc9a28b88 am: e2a6e9a49a am: 2ca334851b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I8557b955af2d28122054df5236a38543523909f4

Aaron Huang   authored and   Automerger Merge Worker   commited 2020-06-18 10:49:25 +00:00
7da3b91275
Merge "Move DnsPacket to libs net" into rvc-dev am: 271db73395 am: 0c1f0247d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: I130496147364f798817d7d12e814749e86f0ab0c

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-06-18 10:47:59 +00:00
7d7a284f4e
Merge "Address comments from aosp/1298476" am: 6dc9a28b88 am: e2a6e9a49a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I7b119758ac7cd65defdec77692957287af17566d

Aaron Huang   authored and   Automerger Merge Worker   commited 2020-06-18 10:47:47 +00:00
2ca334851b
Merge "Move DnsPacket to libs net" into rvc-dev am: 271db73395
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: Ia19cb44ad56e4358c63564261d481459d1386542

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-06-18 10:34:11 +00:00
0c1f0247d5
Merge "Address comments from aosp/1298476" am: 6dc9a28b88
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I3c7c0ef738b6c6b964dc91c593cbf2b6166e3843

Aaron Huang   authored and   Automerger Merge Worker   commited 2020-06-18 10:34:10 +00:00
e2a6e9a49a
Merge "Address comments from aosp/1298476"
Aaron Huang   authored and   Gerrit Code Review   commited 2020-06-18 10:18:57 +00:00
6dc9a28b88
Merge "Move DnsPacket to libs net" into rvc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2020-06-18 10:14:47 +00:00
271db73395
Move DnsPacket to libs net
This class might be used by some mainline modules.

Bug: 151052811
Test: atest DnsPacketTest
Test: atest DnsResolverTest
Change-Id: I8841d91456952ded5efbf8ea221289aecc7746ad

Luke Huang   commited 2020-06-18 16:17:04 +08:00
8baac073d8
Address comments from aosp/1298476
This patch addresses the followings,
- Pass Looper to NetworkStatsSubscriptionsMonitor constructor
- Replace Looper with TestLooper in unit test
- Assert fail if result of condition check is not expected.

Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsServiceTest
      atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Change-Id: Ibcaba2b38af80cc0ec9a4e428a3b3a1538bc4325

Aaron Huang   commited 2020-06-18 15:05:19 +08:00
50f06aca36