Robert Carr
c1f8f3d42a
[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Exclude secure layers from most screenshots taken by the system server." into pi-dev am: 6265a0fc50 -s ours
...
am: 3d8f771d95
Change-Id: I99342d7b1ba402595d8775aa8afe6e0d2f3e3347
2019-05-08 12:39:11 -07:00
Aran Ink
2d4fdc05e7
Merge "Add secure settings for Global Actions Panel." into qt-dev
...
am: c8cb13a537
Change-Id: I9afd4501b7f28e358394ee49b8537d26f9ab72db
2019-05-08 12:14:42 -07:00
Robert Carr
3d8f771d95
[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Exclude secure layers from most screenshots taken by the system server." into pi-dev
...
am: 6265a0fc50 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie0051f57f871f5312a9ed05943481a383139f3ea
2019-05-08 12:11:33 -07:00
Daniel Nishi
9460e54abc
Merge "Remove the cache size from internal size." into qt-dev
...
am: 10f78591a7
Change-Id: Id9e87dcada22fb48218ddd2c9bfc2293fd5ece18
2019-05-08 11:57:24 -07:00
Aran Ink
c8cb13a537
Merge "Add secure settings for Global Actions Panel." into qt-dev
2019-05-08 18:56:26 +00:00
TreeHugger Robot
6265a0fc50
Merge "[RESTRICT AUTOMERGE]: Exclude secure layers from most screenshots taken by the system server." into pi-dev
2019-05-08 18:56:19 +00:00
Daniel Nishi
10f78591a7
Merge "Remove the cache size from internal size." into qt-dev
2019-05-08 18:28:00 +00:00
Matt Pietal
dcdee8080c
Merge "Sharesheet - Address misleading logs" into qt-dev
...
am: b6e2ab9db9
Change-Id: Ibbef8ae59129ea238b519cac3e82616ae6a52e2e
2019-05-08 11:26:52 -07:00
Felipe Leme
d4a8c28994
Merge "Clean augmented-only autofill sessions when augmented service changes." into qt-dev
...
am: a517b0d8d2
Change-Id: I2e969e4f14a352d5f17b24a217f0b607137494b2
2019-05-08 11:18:10 -07:00
Christine Franks
29e86faf4e
Merge "Validate vendor display color modes" into qt-dev
...
am: 1da3d01b5e
Change-Id: Iad3419fbbb43177bb137c17c45b34f494d34ff8b
2019-05-08 11:12:24 -07:00
Matt Pape
7fd02400e6
Merge "Update PackageWatchdog to use the properties listener for DeviceConfig." into qt-dev
...
am: 3a80d7f003
Change-Id: Ic87b469dd617664ff284dda0bd72d4df5c844729
2019-05-08 11:06:21 -07:00
TreeHugger Robot
b6e2ab9db9
Merge "Sharesheet - Address misleading logs" into qt-dev
2019-05-08 17:59:33 +00:00
Beverly Tai
b40c241c42
Merge "Add callback to OverlayPlugin - updates forcePluginOpen" into qt-dev
...
am: 6588949b2c
Change-Id: I576f07be29ee3286b6ccd3eea47f42c4916626d9
2019-05-08 10:59:00 -07:00
TreeHugger Robot
a517b0d8d2
Merge "Clean augmented-only autofill sessions when augmented service changes." into qt-dev
2019-05-08 17:45:50 +00:00
Mark Renouf
433320fc95
Merge "Adds missing break after last statement in switch" into qt-dev
...
am: 515e9043cd
Change-Id: I3195cef1b8cdf42c143d3a358b876281bd4b2cd2
2019-05-08 10:38:27 -07:00
Christine Franks
1da3d01b5e
Merge "Validate vendor display color modes" into qt-dev
2019-05-08 17:38:21 +00:00
Matt Pape
3a80d7f003
Merge "Update PackageWatchdog to use the properties listener for DeviceConfig." into qt-dev
2019-05-08 17:32:40 +00:00
Mark Renouf
5a3826bead
Merge "Updates BubbleData sorting and grouping to spec" into qt-dev
...
am: d6cddfedf9
Change-Id: Id07b8330b9d85a81663ba8ba0154c01421deffab
2019-05-08 10:30:12 -07:00
Beverly Tai
6588949b2c
Merge "Add callback to OverlayPlugin - updates forcePluginOpen" into qt-dev
2019-05-08 17:22:26 +00:00
Mark Renouf
515e9043cd
Merge "Adds missing break after last statement in switch" into qt-dev
2019-05-08 17:13:58 +00:00
Felipe Leme
a182f9c95f
Merge "Disable existing ContentCapture sessions if service changes their whitelist status." into qt-dev
...
am: d97db54da4
Change-Id: I2e404b24e66d02afcc9ab64f15b67d391f914997
2019-05-08 10:07:36 -07:00
Mark Renouf
d6cddfedf9
Merge "Updates BubbleData sorting and grouping to spec" into qt-dev
2019-05-08 16:58:20 +00:00
Felipe Leme
d97db54da4
Merge "Disable existing ContentCapture sessions if service changes their whitelist status." into qt-dev
2019-05-08 16:34:17 +00:00
Felipe Leme
cbe35cc08f
Clean augmented-only autofill sessions when augmented service changes.
...
Test: manual verification
Test: atest CtsContentCaptureServiceTestCases # sanity check
Bug: 123100811
Merged-In: I3de4895e2baea6f127ec3062bc0affbc40343d52
Change-Id: I3de4895e2baea6f127ec3062bc0affbc40343d52
2019-05-08 16:33:07 +00:00
Torne (Richard Coles)
e5b1bc3f5f
Merge "Increase 32-bit WebView VA reservation." into qt-dev
...
am: c7c7f9ecd7
Change-Id: I82628f43fe6e3f8d520424536d0b1918760e08e2
2019-05-08 09:15:49 -07:00
Eric Laurent
7ce531699d
Merge "AudioService: refine concurrent capture policy" into qt-dev
...
am: 105d1edaa2
Change-Id: I8950e009810ad83f0055f3208787684e7fdc67f9
2019-05-08 08:54:09 -07:00
TreeHugger Robot
c7c7f9ecd7
Merge "Increase 32-bit WebView VA reservation." into qt-dev
2019-05-08 15:41:50 +00:00
Eric Laurent
105d1edaa2
Merge "AudioService: refine concurrent capture policy" into qt-dev
2019-05-08 15:36:25 +00:00
Mark Renouf
ba5ab51bc3
Updates BubbleData sorting and grouping to spec
...
This change adds onBubbleOrderChanged to BubbleStackView
to try to keep the order synchronized. There are some known
issues with the animation and visual state, which will be
addressed in a follow up CL.
Bug: 123542488
Test: BubbleControllerTest BubbleDataTest
Change-Id: Ie5a679df2f3069236f4d67a3fce4189b39b9eb28
2019-05-08 11:23:15 -04:00
Fabian Kozynski
63c8b74e6d
Merge "Scale all StatusBarIconView status icons to 17dp" into qt-dev
...
am: 0d74728638
Change-Id: I3ff4621746cf80c812a20a77b6e2e1d921890488
2019-05-08 08:15:03 -07:00
TreeHugger Robot
0d74728638
Merge "Scale all StatusBarIconView status icons to 17dp" into qt-dev
2019-05-08 14:52:24 +00:00
Jorim Jaggi
cd60bc92a4
Merge "Pretend to be having the original background" into qt-dev
...
am: f9363aadeb
Change-Id: I41bb04676fd23fc968db37417b2cfc5c51aede20
2019-05-08 05:42:59 -07:00
Jorim Jaggi
f9363aadeb
Merge "Pretend to be having the original background" into qt-dev
2019-05-08 12:21:53 +00:00
Lorenzo Colitti
21fff9c0c7
[automerger skipped] Merge "Add EPROTONOSUPPORT to IpSecManager SSE map" into qt-dev
...
am: a1a0653dab -s ours
am skip reason: change_id Iec3d5fc4a9bcad7c104414afefae775232d46558 with SHA1 dcbc670688 is in history
Change-Id: Ifb346ddf63b0d6547f3c67110c17c630f3aa72c9
2019-05-08 02:37:04 -07:00
Lorenzo Colitti
a1a0653dab
Merge "Add EPROTONOSUPPORT to IpSecManager SSE map" into qt-dev
2019-05-08 09:20:09 +00:00
Kevin Chyn
fecf157091
Do not set positive button visibility if dialog is from restored state
...
am: 30c76081f5
Change-Id: If0d25995069aeeaff9e50fbfac9c492a684493a2
2019-05-08 00:29:13 -07:00
Kevin Chyn
30c76081f5
Do not set positive button visibility if dialog is from restored state
...
Also fix hidden dependency where positive button is enabled through
a dependency. Explicitly set visiblity where setEnabled occurs now.
Fixes: 132203917
Test: manual
Change-Id: Iba1e01a7c6b64a0f6a2721ddffac9d785981e9a0
2019-05-08 07:16:30 +00:00
Kevin Chyn
ac2dbe25c5
Merge "Get color directly and remove redundant clearMessage()" into qt-dev
...
am: 4b9f575018
Change-Id: I69e12a8c377765e0f7287a3cd175a2cdfbc892c2
2019-05-08 00:00:03 -07:00
Kevin Chyn
40331e3f63
Merge "Update BiometricPrompt colors" into qt-dev
...
am: 09688e30f3
Change-Id: Id87aa2cf6733099ee05b59d68ef313fac42472e5
2019-05-07 23:51:46 -07:00
Kevin Chyn
4b9f575018
Merge "Get color directly and remove redundant clearMessage()" into qt-dev
2019-05-08 06:26:56 +00:00
Kevin Chyn
09688e30f3
Merge "Update BiometricPrompt colors" into qt-dev
2019-05-08 06:25:01 +00:00
Hyunyoung Song
df0be35708
Merge "ic_corp_badge shape change on adaptive icon shape change" into qt-dev
...
am: e967fe3dab
Change-Id: I1303877c07ea567d06b3a46db5ffbc2d9dc5347a
2019-05-07 22:42:24 -07:00
Christopher Dombroski
145bf14205
[automerger skipped] OP_REQUEST_INSTALL_PACKAGES denied by default am: 43e682abef am: 93780658ba am: e2d4ed92b4 am: abbe99e0f0 -s ours
...
am: 751bca7461 -s ours
am skip reason: change_id I2578251906f6656b83464d1c4fc4db99165841c9 with SHA1 acc75528ff is in history
Change-Id: Ia1e3e16e977240985ce83fb794df4fbb27c3bc33
2019-05-07 22:34:47 -07:00
Hyunyoung Song
e967fe3dab
Merge "ic_corp_badge shape change on adaptive icon shape change" into qt-dev
2019-05-08 05:10:00 +00:00
Frank Li
a75134f89f
[automerger skipped] Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log per-query information" am: 8ff4a5a5b5
...
am: 351cc241da -s ours
am skip reason: change_id Ib75affea5d849437a293affbe294732153511d97 with SHA1 a2e19c0f91 is in history
Change-Id: I48d208d7b24c2cc7f95be824f1de6de0cbcd9e57
2019-05-07 21:55:04 -07:00
Christopher Dombroski
751bca7461
[automerger skipped] OP_REQUEST_INSTALL_PACKAGES denied by default am: 43e682abef am: 93780658ba am: e2d4ed92b4
...
am: abbe99e0f0 -s ours
am skip reason: change_id I2578251906f6656b83464d1c4fc4db99165841c9 with SHA1 acc75528ff is in history
Change-Id: I7bb9a8f7dbbffe346f383cb1e33463a6389f1a4f
2019-05-07 21:45:43 -07:00
Winson Chung
2d181c2f41
Merge "Ensure we only remove messages for the same app info" into qt-dev
...
am: a69375ec2e
Change-Id: I7b0de9f5b74c65fadac202835633a2f53e2b2a3b
2019-05-07 21:26:38 -07:00
Frank Li
351cc241da
Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log per-query information"
...
am: 8ff4a5a5b5
Change-Id: I16ada24faf991dc95326c9c56df9daa3a07519ba
2019-05-07 21:18:01 -07:00
Christopher Dombroski
abbe99e0f0
OP_REQUEST_INSTALL_PACKAGES denied by default am: 43e682abef am: 93780658ba
...
am: e2d4ed92b4
Change-Id: I7b440302c64f54d33ec4afce2ac517288cc5cba6
2019-05-07 21:12:12 -07:00
Kevin Chyn
69164ae5fa
Merge "Handle [error->pending_confirmation] and [error->authenticated] animations" into qt-dev
...
am: 9d4fda2a96
Change-Id: I49961ea4aad98721d1100c4da823c0bbc330d3a6
2019-05-07 20:54:39 -07:00