Commit Graph

542466 Commits

Author SHA1 Message Date
TreeHugger Robot
a307a28a7a Merge "Improve GlobalActionsImeTest reliability" into rvc-dev 2020-06-20 11:38:48 +00:00
Yanting Yang
5ff7805204 Fix flaky fail of ApplicationsStateRoboTest
The flaky fail of ApplicationsStateRoboTest is affected by that we added
a thread mechanism to load the app icon in the AppEntry constructor
which is to improve the scrolling of App info page. There will have a
default app icon if the thread finish before icon null assertion.

In the latest design, the app icon null assertion is not required,
therefore remove them to fix test fail.

Fixes: 159402083
Test: robotests
Change-Id: If2577292a42c653ae3c7bebe9392f4fb62365a44
2020-06-20 18:42:56 +08:00
Automerger Merge Worker
8c2e3370e9 Merge "[automerger skipped] Merge "Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde am: d2f273c3aa" into rvc-d1-dev-plus-aosp am: 17057c3e00 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-20 09:11:31 +00:00
Lyn Han
6f910e8a6f Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde am: 86f6e9a5d0 am: c60cd80ea4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827738

Change-Id: I55b37f57770671a9e30ff06193a679d765427648
2020-06-20 09:11:19 +00:00
Automerger Merge Worker
9ed49f4e40 [automerger skipped] Merge "Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde am: d2f273c3aa" into rvc-d1-dev-plus-aosp am: 17057c3e00 -s ours
am skip reason: Change-Id I9f6104d88693144d7e247c05a6a41ed216d0eef0 with SHA-1 b539797234 is in history

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

Change-Id: I42b5073beeeaebdf32deb526d954c94245175d69
2020-06-20 09:11:15 +00:00
Lyn Han
0311e9b308 Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde am: 86f6e9a5d0 am: c68cd95746
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827738

Change-Id: I12181b57fa8cc547adf8be8db1cd27eee43aa540
2020-06-20 09:11:00 +00:00
Automerger Merge Worker
17057c3e00 Merge "Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde am: d2f273c3aa" into rvc-d1-dev-plus-aosp 2020-06-20 08:59:35 +00:00
Lyn Han
c60cd80ea4 Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde am: 86f6e9a5d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827738

Change-Id: Ifad6ae9250c90d77a4503f15bfa43c95b86a3e65
2020-06-20 08:59:30 +00:00
Lyn Han
3462c349a9 Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde am: d2f273c3aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827738

Change-Id: I48ae779824db645e52a134454fd71e1ecf33782f
2020-06-20 08:59:30 +00:00
Lyn Han
c68cd95746 Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde am: 86f6e9a5d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827738

Change-Id: I62b3cd226585ecd5483fb8fe6ec2862b1107b2e3
2020-06-20 08:59:26 +00:00
Lyn Han
d2f273c3aa Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827738

Change-Id: I850deb51551854b50644bf4617083b89c9239ec9
2020-06-20 08:43:34 +00:00
Lyn Han
86f6e9a5d0 Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbfde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827738

Change-Id: I97bb0c1d3b5209446306b9b929c522ec36b5c68f
2020-06-20 08:43:14 +00:00
Lyn Han
d0ab0bbfde Merge "Auto-expand bubble for priority notif" into rvc-dev 2020-06-20 08:32:56 +00:00
Mike Yu
6a49d466d2 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
Michael Wachenschwanz
f15b6fa7e4 Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0 am: a670d8a1d0 am: b8a5303295
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909

Change-Id: Id03160d00cf793c7726983708521078c9aeb6e43
2020-06-20 06:44:16 +00:00
Automerger Merge Worker
c976f0ee23 Merge "Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0 am: d476c27fb0" into rvc-d1-dev-plus-aosp am: 0ec93dfac6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909

Change-Id: If68a41662605279448a2e4eb90b9f835f64fa380
2020-06-20 06:43:58 +00:00
Automerger Merge Worker
a2a64922fa Merge changes from topic "am-813dbefeaeb8460681ce1543909a5a61" into rvc-qpr-dev-plus-aosp
* changes:
  Merge changes from topic "am-e3cb07a527844fa6b5ffa85e184f8e56" into rvc-d1-dev-plus-aosp am: 708fad091d
  Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: e8ea59e25d am: a54f2e7024
2020-06-20 06:42:35 +00:00
Automerger Merge Worker
67190bb8b4 Merge changes from topic "am-e3cb07a527844fa6b5ffa85e184f8e56" into rvc-d1-dev-plus-aosp am: 708fad091d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: Ieda51f82ba90db7de1350cce2e8f34443e8c0e6c
2020-06-20 06:42:28 +00:00
Michael Wachenschwanz
cbbcfdc372 Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0 am: d476c27fb0 am: 2187ff87cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909

Change-Id: Id5a39b7ce5a994cf6ba74b1b81321f0e2f300ac9
2020-06-20 06:42:26 +00:00
TreeHugger Robot
678d411cf7 Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: e8ea59e25d am: a54f2e7024
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: Ic3b2db632a68af6d8dd613823a4fe7044c38317d
2020-06-20 06:42:24 +00:00
TreeHugger Robot
941d391890 Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: 15a4a9ab5f am: 6a9b73f478
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I088068f32fdff5c36102a4ad77638e3b29d5b397
2020-06-20 06:42:03 +00:00
Suprabh Shukla
f00c9e5529 RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614 am: ba561741ae am: dd74d291d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I11125f44ca03d8fe5e7ef7a15bc99a4cdaa17230
2020-06-20 06:41:58 +00:00
TreeHugger Robot
b90799e0ae Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: 15a4a9ab5f am: fb22c06eb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I0759177d78e827bd93806d39b0279fd8cc6b2ab3
2020-06-20 06:41:44 +00:00
Suprabh Shukla
24cf69cd5b RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614 am: ba561741ae am: 58fac5023e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I246b893d9fe25054be9cedc8569ca5c1d60c9c8e
2020-06-20 06:41:40 +00:00
Michael Wachenschwanz
2187ff87cf Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0 am: d476c27fb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909

Change-Id: I5b20f96c6df08bfa10dadf63d1ecb9fc6c7a2a61
2020-06-20 06:30:01 +00:00
TreeHugger Robot
6a9b73f478 Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: 15a4a9ab5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I88d637ddf89a7f4509dd8e3b5349ddb7f29eb469
2020-06-20 06:29:44 +00:00
Michael Wachenschwanz
b8a5303295 Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0 am: a670d8a1d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909

Change-Id: I5990048687384b2562161b9908cdda01887f93c3
2020-06-20 06:29:40 +00:00
Automerger Merge Worker
0ec93dfac6 Merge "Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0 am: d476c27fb0" into rvc-d1-dev-plus-aosp 2020-06-20 06:29:39 +00:00
Suprabh Shukla
dd74d291d3 RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614 am: ba561741ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I2658d25d132482b80e1fedd5ec3cc112c2c71dd2
2020-06-20 06:29:39 +00:00
Automerger Merge Worker
708fad091d Merge changes from topic "am-e3cb07a527844fa6b5ffa85e184f8e56" into rvc-d1-dev-plus-aosp
* changes:
  Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: e8ea59e25d
  RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614 am: 72fe499eed
2020-06-20 06:29:36 +00:00
Michael Wachenschwanz
b7bb71cfb5 Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0 am: d476c27fb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909

Change-Id: I5be39844fb7f15c0174d7b77fdd126e58dbb7f2f
2020-06-20 06:29:30 +00:00
TreeHugger Robot
a54f2e7024 Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: e8ea59e25d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I8567339c31585710cd07585da67edee294b558dd
2020-06-20 06:29:25 +00:00
Suprabh Shukla
28636d8526 RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614 am: 72fe499eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I5e9124dbbae1098793c0ca90c999b08418a8ddb0
2020-06-20 06:29:22 +00:00
TreeHugger Robot
fb22c06eb4 Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: 15a4a9ab5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I9214017de463dd4c7e9be0c790ac345663201003
2020-06-20 06:29:12 +00:00
Suprabh Shukla
58fac5023e RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614 am: ba561741ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I645287080071abb02e8e7376307e8bc9f74c05a5
2020-06-20 06:29:05 +00:00
Michael Wachenschwanz
a670d8a1d0 Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909

Change-Id: Icbd54d810834d816fd68f526860debdf7e5948b8
2020-06-20 06:14:05 +00:00
Michael Wachenschwanz
d476c27fb0 Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909

Change-Id: I991138bdd83df7ff29ab75c6fc6aaf5c96f9b7e3
2020-06-20 06:14:03 +00:00
TreeHugger Robot
e8ea59e25d Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: If05bc46041c54bdb8e7b1da8d531f26ad903f8e5
2020-06-20 06:13:42 +00:00
Suprabh Shukla
72fe499eed RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I8378051df51832a33a53c55a128b0860691037b1
2020-06-20 06:13:32 +00:00
TreeHugger Robot
15a4a9ab5f Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: I3d5b6c4fa7227f6841b4d14ffc235451f00ff996
2020-06-20 06:13:29 +00:00
Suprabh Shukla
ba561741ae RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905673

Change-Id: Ie30698c32f2347db2b12a4665629676fb913f57d
2020-06-20 06:13:19 +00:00
Jeff Chang
79f5a49b3c Revert "Fix transition return issues when more than 1 level depth"
This reverts commit 6d834d86fb.

Reason for revert: <http://b/159230864 WhatsApp image is visible after existing a chat>
Bug: 159230864

Change-Id: Ib266cff2e06a82ae9a0e85142ef80ae00328a040
2020-06-20 06:09:04 +00:00
Michael Wachenschwanz
5d544ddff0 Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev 2020-06-20 06:07:00 +00:00
TreeHugger Robot
97bd35e552 Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev 2020-06-20 05:59:09 +00:00
Mark Chien
48e3604504 [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours am: 798f6db98c -s ours am: d9572716d8 -s ours
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 0ed433e4cd is in history

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

Change-Id: I05bbffec3b2ae92a254c5f66ad90b5dd85babb5b
2020-06-20 04:58:44 +00:00
markchien
fc90a690d8 [automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 4b198cb8c3 am: f7d9dd76ab -s ours am: e37ca4b0bc -s ours am: 197eefae73 -s ours
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 b1cb53b481 is in history

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

Change-Id: I7c1fdc3e1cfefd33cbbc8bc61c4b0c8ea569530e
2020-06-20 04:58:41 +00:00
Automerger Merge Worker
47014bff4c Merge "Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef am: 66d53819d0" into rvc-d1-dev-plus-aosp am: 3bedc12cae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871514

Change-Id: Iddaa66169f64878b039fd02da058bc0287feab3b
2020-06-20 04:57:23 +00:00
Amith Yamasani
f4c1e9d2a1 Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef am: 66d53819d0 am: 5a3620c470
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871514

Change-Id: Idf2ecdcb71d6e0cb20e9ef270c0e3135adb979c0
2020-06-20 04:57:07 +00:00
Amith Yamasani
ae873faed9 Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef am: b259f054d0 am: 1a8c5848a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871514

Change-Id: Ie27623b4d5a8acfcaf140df8ffb0ca974a278e77
2020-06-20 04:56:35 +00:00
Mark Chien
d9572716d8 [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours am: 798f6db98c -s ours
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 0ed433e4cd is in history

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

Change-Id: I3c929eb2c80666d88ba8780b8761237b6945f308
2020-06-20 04:39:06 +00:00