Lorenzo Colitti
eaa4bb0152
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 1b7f9ca7d0 am: 643fbc8e47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938
Change-Id: I81f54b3251ded57e4c03693e405bf1916a3fdf34
2020-06-22 09:30:49 +00:00
Lorenzo Colitti
a5b40ffb4d
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 1b7f9ca7d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938
Change-Id: I0ce82679bf81e3c58fed12943b7c9ca9d449fb7f
2020-06-22 09:14:15 +00:00
Lorenzo Colitti
643fbc8e47
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 1b7f9ca7d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938
Change-Id: Ibdf37115a43d5ebbc4e34b5668351916ee5671d1
2020-06-22 09:13:55 +00:00
Lorenzo Colitti
1b7f9ca7d0
Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev
2020-06-22 09:00:25 +00:00
Mike Yu
b6b7e0c2be
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
2020-06-22 08:57:49 +00:00
paulhu
f2db66615d
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
2020-06-22 15:32:01 +08:00
Mike Yu
87b5785191
Merge "Support DNS-over-TLS probes in NetworkDiagnostics" am: 64ffa1762f am: 4e04c11379 am: 3efb6bd1ec am: 015474f4a8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1011670
Change-Id: I82a69bd60b4a75d04fdd8b7328ae8d8e1a15ffaf
2020-06-22 07:21:20 +00:00
Mike Yu
015474f4a8
Merge "Support DNS-over-TLS probes in NetworkDiagnostics" am: 64ffa1762f am: 4e04c11379 am: 3efb6bd1ec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1011670
Change-Id: Ib9a029adad8e0a64cc57b95a902d5dad04cb489a
2020-06-22 07:12:01 +00:00
Mike Yu
3efb6bd1ec
Merge "Support DNS-over-TLS probes in NetworkDiagnostics" am: 64ffa1762f am: 4e04c11379
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1011670
Change-Id: I25a06623d87e6971a9dac73bdea82a78fd6124d6
2020-06-22 06:56:39 +00:00
Mike Yu
4e04c11379
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
2020-06-22 06:45:25 +00:00
Mike Yu
6cad4b10db
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
2020-06-20 16:22:35 +08:00
android-build-team Robot
866878fbbe
Snap for 6610691 from 803d1971a72feb841ef4849eb4ee66bba6e4c06c to rvc-release
...
Change-Id: Ib2b3431658bea4b91fddcc98da01dbd3567b2f4b
2020-06-20 01:09:54 +00:00
android-build-team Robot
6f44e2a50b
Make change and version bump to r_aml_300802100 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I7af1c3a55b61516884940432f9146eb26c169668
2020-06-19 07:17:59 +00:00
Automerger Merge Worker
df66d26791
Merge "Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6e5b6b612d am: 2b7046ac9b am: 778ae844e9" into rvc-qpr-dev-plus-aosp
2020-06-19 01:41:35 +00:00
Remi NGUYEN VAN
51ba806c15
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6e5b6b612d am: 2b7046ac9b am: 778ae844e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903
Change-Id: I79af90ded28a5bbc3f607f50947fda21fe613c34
2020-06-19 01:41:22 +00:00
Remi NGUYEN VAN
22c5185069
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6e5b6b612d am: 2b7046ac9b am: 448560b25b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903
Change-Id: I50b32efed3d5398346450c34afc45c6e6ab3d9f3
2020-06-19 01:41:07 +00:00
Remi NGUYEN VAN
dc3d09b7cd
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6e5b6b612d am: 7007e35032 am: 2800777272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903
Change-Id: Ia943e2cdc74480ea0bbbd07478befaeefac97189
2020-06-19 01:40:35 +00:00
Remi NGUYEN VAN
778ae844e9
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6e5b6b612d am: 2b7046ac9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903
Change-Id: I2ec211557839533327cc747857a09bd323654ad6
2020-06-19 01:22:47 +00:00
Remi NGUYEN VAN
2800777272
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6e5b6b612d am: 7007e35032
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903
Change-Id: I17459fc7a4239b10b6b55412d126557719e1bd98
2020-06-19 01:22:28 +00:00
android-build-team Robot
ef901ed5bf
Snap for 6606167 from 853ee379371ffa2e9aadd8dc3a96c4ef245e3924 to rvc-release
...
Change-Id: I540700770fa9eeb9714e50a805d7cafc01793a8c
2020-06-19 01:09:53 +00:00
Remi NGUYEN VAN
7007e35032
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6e5b6b612d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903
Change-Id: Icd141a992c46290c74929785e261a1cd57bc001b
2020-06-19 01:08:48 +00:00
Remi NGUYEN VAN
2b7046ac9b
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6e5b6b612d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903
Change-Id: Ia5028f7dfeadbcf928efb9862b481c82e2849e18
2020-06-19 01:08:47 +00:00
Remi NGUYEN VAN
6e5b6b612d
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev
2020-06-19 00:49:29 +00:00
Lorenzo Colitti
80d4684572
Merge "Move DnsPacket to libs net" into rvc-dev am: 81f0fe48d2 am: 5409cf46b5 am: d7e96fe5ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: Ia864febe574f607767a39fc6df99f114e242c304
2020-06-18 15:31:23 +00:00
Lorenzo Colitti
94addf19f3
Merge "Move DnsPacket to libs net" into rvc-dev am: 81f0fe48d2 am: 5409cf46b5 am: c0cd967d5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: If3773200c63930e21cab018b3322c3dda42ba6f9
2020-06-18 15:28:46 +00:00
Luke Huang
72be68ef27
Merge "Disable sockets and DNS if process lacks INTERNET permission." into rvc-dev am: bbcd3b326b am: 854adb51eb am: 505650a64f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881939
Change-Id: Icca2ae80d7d669fc5d9d8e3658d81cb1e9e69917
2020-06-18 15:13:27 +00:00
Luke Huang
3ed9592ee0
Merge "Disable sockets and DNS if process lacks INTERNET permission." into rvc-dev am: bbcd3b326b am: 854adb51eb am: e3c9c6bfe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881939
Change-Id: Ib0234ff767b1bcfe6829037fcf68d8e87031a9ad
2020-06-18 15:12:20 +00:00
Lorenzo Colitti
d7e96fe5ae
Merge "Move DnsPacket to libs net" into rvc-dev am: 81f0fe48d2 am: 5409cf46b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: I3f1edfe442f3408a19c9a901fb35bde8ef22950b
2020-06-18 15:02:30 +00:00
Lorenzo Colitti
5409cf46b5
Merge "Move DnsPacket to libs net" into rvc-dev am: 81f0fe48d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: I74cac5c415d8b3447b57cda7cba1caa215e84ea2
2020-06-18 14:58:19 +00:00
TreeHugger Robot
d92d22fd67
[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: 65efcc84a0 am: 9a0218f958 -s ours am: a352edc747 -s ours
...
am skip reason: Change-Id Ic979dad73983d722365849fbfb0becfd432b894c with SHA-1 b001522433 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869883
Change-Id: I474985691913c254b8683d375641c7c8319a0729
2020-06-18 14:56:19 +00:00
TreeHugger Robot
b521540559
[automerger skipped] Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f56147 am: b3a9f82988 -s ours am: fb2d643937 -s ours
...
am skip reason: Change-Id I57987233d42a0253eaee2e1ca5f28728c2354620 with SHA-1 58897cc491 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882397
Change-Id: Ie3c180e7085612c892d4494299a53ee84f0f8a02
2020-06-18 14:55:50 +00:00
Luke Huang
505650a64f
Merge "Disable sockets and DNS if process lacks INTERNET permission." into rvc-dev am: bbcd3b326b am: 854adb51eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881939
Change-Id: I6631692e31afe751c89b5647ca51cca288b5b329
2020-06-18 14:46:29 +00:00
Luke Huang
854adb51eb
Merge "Disable sockets and DNS if process lacks INTERNET permission." into rvc-dev am: bbcd3b326b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881939
Change-Id: I10202dc784bafa044a04546d0a765370331223dc
2020-06-18 14:46:02 +00:00
TreeHugger Robot
a352edc747
[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: 65efcc84a0 am: 9a0218f958 -s ours
...
am skip reason: Change-Id Ic979dad73983d722365849fbfb0becfd432b894c with SHA-1 b001522433 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869883
Change-Id: I5351565ef7b11ebc95ddb99b60bba34b9793bfaa
2020-06-18 14:38:58 +00:00
TreeHugger Robot
fb2d643937
[automerger skipped] Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f56147 am: b3a9f82988 -s ours
...
am skip reason: Change-Id I57987233d42a0253eaee2e1ca5f28728c2354620 with SHA-1 58897cc491 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882397
Change-Id: Ic398329038eb9e91f6ad9676865448f7317edeef
2020-06-18 14:35:54 +00:00
TreeHugger Robot
9a0218f958
Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: 65efcc84a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869883
Change-Id: I84b0010488024aa9867ad4af7a4013854cdeeaa1
2020-06-18 14:34:45 +00:00
TreeHugger Robot
b3a9f82988
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
2020-06-18 14:29:52 +00:00
Aaron Huang
d01848756d
Merge "Address comments from aosp/1298476" am: 48fbda02b0 am: 76d4f3513f am: 69b06f9369 am: 0f24079a53
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040
Change-Id: I067965de3d884bfe8f2832e5116daadd5bda1ae5
2020-06-18 11:06:40 +00:00
Lorenzo Colitti
c88624f094
Merge "Move DnsPacket to libs net" into rvc-dev am: 81f0fe48d2 am: 1ff1653dbb am: ca72aa0a4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: I15e4f426e47cdc77a1cdccb1501f7e649c9a6bbf
2020-06-18 11:04:23 +00:00
Aaron Huang
0f24079a53
Merge "Address comments from aosp/1298476" am: 48fbda02b0 am: 76d4f3513f am: 69b06f9369
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040
Change-Id: I8557b955af2d28122054df5236a38543523909f4
2020-06-18 10:49:25 +00:00
Lorenzo Colitti
ca72aa0a4f
Merge "Move DnsPacket to libs net" into rvc-dev am: 81f0fe48d2 am: 1ff1653dbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: I130496147364f798817d7d12e814749e86f0ab0c
2020-06-18 10:47:59 +00:00
Aaron Huang
69b06f9369
Merge "Address comments from aosp/1298476" am: 48fbda02b0 am: 76d4f3513f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040
Change-Id: I7b119758ac7cd65defdec77692957287af17566d
2020-06-18 10:47:47 +00:00
Lorenzo Colitti
1ff1653dbb
Merge "Move DnsPacket to libs net" into rvc-dev am: 81f0fe48d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: Ia19cb44ad56e4358c63564261d481459d1386542
2020-06-18 10:34:11 +00:00
Aaron Huang
76d4f3513f
Merge "Address comments from aosp/1298476" am: 48fbda02b0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040
Change-Id: I3c7c0ef738b6c6b964dc91c593cbf2b6166e3843
2020-06-18 10:34:10 +00:00
Aaron Huang
48fbda02b0
Merge "Address comments from aosp/1298476"
2020-06-18 10:18:57 +00:00
Lorenzo Colitti
81f0fe48d2
Merge "Move DnsPacket to libs net" into rvc-dev
2020-06-18 10:14:47 +00:00
Luke Huang
51221efa45
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
2020-06-18 16:17:04 +08:00
android-build-team Robot
3c1e9a9d9e
Make change and version bump to r_aml_300802000 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I6601ad32346eec33bef7dde00ae7d744c86aa8e4
2020-06-18 07:17:34 +00:00
Aaron Huang
69bfb5afea
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
2020-06-18 15:05:19 +08:00
Aaron Huang
9b08449fa7
Merge "Dynamically enable/disable watch for RAT type changes" am: 3fdad73a32 am: cc1d6b13d6 am: c98228cf54 am: a9a2ee5bfc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315574
Change-Id: I61d7242d2c597e680953d2603b0b54962dd749b3
2020-06-18 04:40:20 +00:00