Vladimir Marko
80b7deb297
Merge "Remove unnecessary dependencies on ART libraries." am: b1ec613190
...
am: acf264091b
2019-05-28 02:08:24 -07:00
Vladimir Marko
acf264091b
Merge "Remove unnecessary dependencies on ART libraries."
...
am: b1ec613190
2019-05-28 02:03:16 -07:00
Vladimir Marko
b1ec613190
Merge "Remove unnecessary dependencies on ART libraries."
2019-05-28 08:43:47 +00:00
Gavin Corkery
2676f10410
Merge "Allow PackageManager to retrieve inactive/factory APEXs." into qt-dev
...
am: aef1ff0571
2019-05-28 01:38:11 -07:00
Gavin Corkery
aef1ff0571
Merge "Allow PackageManager to retrieve inactive/factory APEXs." into qt-dev
2019-05-28 08:25:37 +00:00
Luke Huang
431664822c
Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev
...
am: 0edeaa365e
2019-05-27 22:52:59 -07:00
Luke Huang
20c6f40ff8
[automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug
...
am: 7466ac8dc2d352f4ca85
2019-05-27 22:52:47 -07:00
Luke Huang
0edeaa365e
Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev
...
* changes:
Remove broken test testRfc6724Sort
Add Rfc6724 style sort for DnsResolver and fix potential bug
2019-05-28 05:38:49 +00:00
Luke Huang
ad7c294c47
Remove broken test testRfc6724Sort
...
This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.
Bug: 133649648
Test: atest DnsUtilsTest
Merged-In: Idc6db433585de067e45088b43665c8e37b310397
(cherry picked from commit 91b35f8842
2019-05-28 03:24:14 +00:00
Xiao Ma
29f6cdcd42
Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 2bc72d2fe0
...
am: 0b9f498f86
2019-05-27 18:12:49 -07:00
Xiao Ma
0b9f498f86
Merge "Wipe the data in IpMemoryStore database upon network factory reset."
...
am: 2bc72d2fe0
2019-05-27 18:07:38 -07:00
Xiao Ma
2bc72d2fe0
Merge "Wipe the data in IpMemoryStore database upon network factory reset."
2019-05-28 00:52:00 +00:00
Tyler Gunn
6573bea11e
Merge "Add extended logging for blocked number contract." into qt-dev
...
am: a80dd06e17
2019-05-27 17:11:31 -07:00
Tyler Gunn
a80dd06e17
Merge "Add extended logging for blocked number contract." into qt-dev
2019-05-28 00:03:16 +00:00
Nathan Harold
9d8c21fba6
Merge "Deprecate getNetworkType" am: d47ae01063
...
am: 40ae3d6281
2019-05-27 14:34:31 -07:00
Nathan Harold
40ae3d6281
Merge "Deprecate getNetworkType"
...
am: d47ae01063
2019-05-27 14:29:22 -07:00
Treehugger Robot
d47ae01063
Merge "Deprecate getNetworkType"
2019-05-27 21:10:50 +00:00
Rubin Xu
8643b456b6
Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev
...
am: 6cf5ea63eb
2019-05-27 13:08:06 -07:00
Rubin Xu
6cf5ea63eb
Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev
2019-05-27 19:50:06 +00:00
Nathan Harold
c13b5519f8
[automerger skipped] Merge "Add permissions check for getNetworkType" am: 0c7239996d
...
am: ab5273d7ce39444b39ba
2019-05-27 12:25:17 -07:00
Nathan Harold
ab5273d7ce
Merge "Add permissions check for getNetworkType"
...
am: 0c7239996d
2019-05-27 12:20:11 -07:00
Treehugger Robot
0c7239996d
Merge "Add permissions check for getNetworkType"
2019-05-27 19:04:39 +00:00
Luke Huang
ab5e4c7429
Merge "Remove broken test testRfc6724Sort" am: e682b1526a
...
am: 79e97b7d21
2019-05-27 07:33:33 -07:00
Luke Huang
79e97b7d21
Merge "Remove broken test testRfc6724Sort"
...
am: e682b1526a
2019-05-27 07:28:26 -07:00
Luke Huang
e682b1526a
Merge "Remove broken test testRfc6724Sort"
2019-05-27 14:12:05 +00:00
Chalard Jean
41bd3c57b4
Merge "Reinstate access to a forgotten member" am: ab6ab9e4d4
...
am: 2f4bd91b99
2019-05-27 04:33:13 -07:00
Chalard Jean
2f4bd91b99
Merge "Reinstate access to a forgotten member"
...
am: ab6ab9e4d4
2019-05-27 04:28:05 -07:00
Treehugger Robot
ab6ab9e4d4
Merge "Reinstate access to a forgotten member"
2019-05-27 11:14:37 +00:00
Paul Hu
170c2ee63e
[automerger skipped] Merge "Fix null IpmemoryService object in AGO project." into qt-dev
...
am: ece7a57af5daff547b43
2019-05-27 04:13:09 -07:00
Paul Hu
ece7a57af5
Merge "Fix null IpmemoryService object in AGO project." into qt-dev
2019-05-27 11:04:15 +00:00
Luke Huang
c04fd72fff
Remove broken test testRfc6724Sort
...
This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.
Bug: 133649648
Test: atest DnsUtilsTest
Change-Id: I91f89782b9b989fa1a49e666bb5ce2df3a0dbbf7
2019-05-27 17:49:32 +08:00
Xiao Ma
d91ec0907e
Wipe the data in IpMemoryStore database upon network factory reset.
...
Bug:128499160
Test: manual
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ib563463a861a5d27b1e9b5fbb92342249b573802
2019-05-27 15:05:09 +09:00
Chalard Jean
aa57c60fca
Merge "Protect VPN dialogs against overlay." into qt-dev
...
am: e02360b53a
2019-05-26 22:37:14 -07:00
Chalard Jean
e02360b53a
Merge "Protect VPN dialogs against overlay." into qt-dev
2019-05-27 05:28:27 +00:00
Bill Yi
2a7d6323a7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 7545f42d2a
2019-05-26 22:27:10 -07:00
TreeHugger Robot
7545f42d2a
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-27 05:19:24 +00:00
Ivan Chiang
547b7b71cf
Merge "Add privapp-permissions for DocumentsUI" into qt-dev
...
am: 1100dd8db9
2019-05-26 19:47:04 -07:00
Ivan Chiang
1100dd8db9
Merge "Add privapp-permissions for DocumentsUI" into qt-dev
2019-05-27 02:33:22 +00:00
Mathew Inwood
5e727c3cda
[automerger skipped] Merge "Revert "Adjusts the USAP pool refill mechanism."" into qt-dev
...
am: b7bf4fa27a51c53b4b74
2019-05-26 18:34:16 -07:00
Paul Hu
8e2743045d
Fix null IpmemoryService object in AGO project.
...
WTF will happen in RegularMaintenanceJobService due to
scheduling job and starting maintenance job are in different
processes. In AGO project, scheduling job use inprocess process.
But starting maintenance job use networkstack process. So
IpmemoryService objcet will be null when trying to do the
maintenance job.
Bug: 132763800
Test: Verify on both AGO and non-AGO projects that WFT will not
happen.
Test: atest NetworkStackTests
Change-Id: I545fc8384ef7b3d97edf2270fa033d8afac2669c
Merged-In: If7f61a8b5ddc8cdd25928cd35afa7fece2c8dde5
Merged-In: I8043c405b3c78d8dd1e71ec584d7a2fdaa2fd989
Merged-In: I545fc8384ef7b3d97edf2270fa033d8afac2669c
(cherry picked from commit 20abd7d4e6
2019-05-27 01:22:15 +00:00
TreeHugger Robot
b7bf4fa27a
Merge "Revert "Adjusts the USAP pool refill mechanism."" into qt-dev
2019-05-27 01:18:42 +00:00
Lucas Dupin
6a862d5a0f
Merge "Fixed that notifications could be stuck and invisible on AOD" into qt-dev
...
am: 791b161405
2019-05-26 17:26:34 -07:00
Lucas Dupin
791b161405
Merge "Fixed that notifications could be stuck and invisible on AOD" into qt-dev
2019-05-27 00:12:31 +00:00
Bill Yi
713049b8de
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I7e400127b8e32ae2ed4ccfa38da548f780f7816b
2019-05-26 12:26:21 -07:00
Bill Yi
35b6920665
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 3a0a965cde
2019-05-26 09:21:56 -07:00
Bill Yi
1d010ab1fd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: edc7e9b6e0
2019-05-26 09:16:56 -07:00
TreeHugger Robot
3a0a965cde
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-26 16:11:04 +00:00
TreeHugger Robot
edc7e9b6e0
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-26 15:59:15 +00:00
Bill Yi
acd9c18172
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I70bdcbe68e65183a76676d341f2ffcb8e2c75bdb
2019-05-26 04:51:06 -07:00
Hyunyoung Song
7a46c4eb0f
Merge "Add navigation mode to Settings.Secure" into qt-dev
...
am: eada1380b1
2019-05-26 00:41:25 -07:00
