TreeHugger Robot
05d0727bc3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 091e7ce76b -s ours am: bddad20dd3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I031aabdc70f8a5afa976164eeab71aba6ce7f752
2020-04-30 19:39:41 +00:00
Matt Pietal
94f93e6edf
Merge "Controls UI - Lock screen support" into rvc-dev am: 303e4056ac am: 0d6dc417c0 am: 11bc1e0855
...
Change-Id: Ia13870fa71de2c5686bad6917b3ac4e80b15716d
2020-04-30 19:14:52 +00:00
TreeHugger Robot
0181e74af5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a3e7e5a175 -s ours am: c76702f998 -s ours am: a6691e847b -s ours
...
am skip reason: subject contains skip directive
Change-Id: I066407d5cc49354256f067b0e692e8bc8bb30db6
2020-04-30 19:14:14 +00:00
TreeHugger Robot
ee3f2db6a5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 091e7ce76b -s ours am: 687f495c32 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2d2ef513f6e71b58759075f66b1df05d79f8faac
2020-04-30 19:12:57 +00:00
Matt Pietal
11bc1e0855
Merge "Controls UI - Lock screen support" into rvc-dev am: 303e4056ac am: 0d6dc417c0
...
Change-Id: I7dd6376038abbe9a81400a0941890cb54aef295a
2020-04-30 19:10:27 +00:00
TreeHugger Robot
a6691e847b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a3e7e5a175 -s ours am: c76702f998 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I33610ba7f0a3f1b2d1733eb2f4545308ece148ea
2020-04-30 19:10:12 +00:00
Tiger Huang
ec32c4481b
Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d am: 5bfc56f05c am: 694b09b19e
...
Change-Id: Icaf14ed2f8268dfeef414f04490b614cba5f5b77
2020-04-30 19:10:06 +00:00
TreeHugger Robot
bddad20dd3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 091e7ce76b -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ica2c25cbe60b459a54cfe27aeb33c86c023cedf5
2020-04-30 19:10:03 +00:00
TreeHugger Robot
687f495c32
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 091e7ce76b -s ours
...
am skip reason: subject contains skip directive
Change-Id: I676ff72a72e1d9caaae1b7e8d4e46779eab46e7a
2020-04-30 19:10:00 +00:00
Matt Pietal
0d6dc417c0
Merge "Controls UI - Lock screen support" into rvc-dev am: 303e4056ac
...
Change-Id: If90143567efa1b0058a9b5619479a0ecd685d2c6
2020-04-30 19:07:26 +00:00
Matt Pietal
303e4056ac
Merge "Controls UI - Lock screen support" into rvc-dev
2020-04-30 18:58:54 +00:00
TreeHugger Robot
c76702f998
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a3e7e5a175 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0f1efa54c6af2d008908af134f7a67fc2ebacc7b
2020-04-30 18:54:34 +00:00
TreeHugger Robot
091e7ce76b
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-04-30 18:44:58 +00:00
TreeHugger Robot
a3e7e5a175
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-30 18:43:30 +00:00
Benedict Wong
6cd453fba4
[automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 449bd6fe45 am: 8994d9d736 am: a97d067217 am: e311ab8b74 -s ours
...
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 4fab295446
2020-04-30 18:37:00 +00:00
Jeff Sharkey
a1a51fa6a6
Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab am: 4e90b707f1 am: 8a96fca5dd am: 760717a058
...
Change-Id: I8328b8182e975952c1c14dea2992fd1375b41e63
2020-04-30 18:36:46 +00:00
Wonsik Kim
543777b924
Merge "RELAND: "media: lazy MediaCodec.release()"" into rvc-dev am: c8a654c21a am: cadc5803db am: 444a9e551a am: 21f9088e44
...
Change-Id: Ic2b16e9e5a1351fa3e6424e318b17862a55d94a7
2020-04-30 18:36:16 +00:00
Tiger Huang
5019177d1f
Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d am: 5bfc56f05c am: b8c8838609
...
Change-Id: I1e4ceb0927473968d04ee0d05283389252f82255
2020-04-30 18:35:52 +00:00
Tiger Huang
b8c8838609
Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d am: 5bfc56f05c
...
Change-Id: Ic02bf693c7fc02950dae046924a9aeb4b361c160
2020-04-30 18:30:19 +00:00
Tiger Huang
694b09b19e
Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d am: 5bfc56f05c
...
Change-Id: I56852abbefbf58960d8eef5b2aeb47587ba41ca7
2020-04-30 18:29:56 +00:00
Tiger Huang
d76c953235
Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d am: 282a713b1a am: 29ea59f79c
...
Change-Id: I55195138a008466a2d465c75da0f7c9f20c931ca
2020-04-30 18:25:53 +00:00
Benedict Wong
e37c55bdc3
Merge "Update MODP groups for IKEv2/IPsec VPNs" am: da820447b2 am: 928b1e7334 am: c0c67eeaf0 am: 27070ceaf3
...
Change-Id: I1514ad1521da7c98df1648067011ee9c5ef18588
2020-04-30 18:25:44 +00:00
Benedict Wong
8631e3e9bd
[automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 449bd6fe45 -s ours am: 763a9e39e1 -s ours am: 4c190a8dcc -s ours
...
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 4fab295446
2020-04-30 18:25:35 +00:00
Automerger Merge Worker
e18c16fa56
Merge "Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab am: bc74668eec" into rvc-d1-dev-plus-aosp am: 95aba25382
...
Change-Id: I2d74b514bd5e6bc19fbc1c4e38c8877d520d33e8
2020-04-30 18:25:21 +00:00
Benedict Wong
dffe692bcb
[automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 449bd6fe45 am: 8994d9d736 -s ours am: 4a5a9302f1 -s ours
...
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 2ed005834f
2020-04-30 18:25:04 +00:00
Benedict Wong
e311ab8b74
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 449bd6fe45 am: 8994d9d736 am: a97d067217
...
Change-Id: Id7d9e5a275416ecd2a57f82f3d586d0865009b5d
2020-04-30 18:24:38 +00:00
Automerger Merge Worker
b1b5c484c0
Merge "Merge "RELAND: "media: lazy MediaCodec.release()"" into rvc-dev am: c8a654c21a am: 8e09576f0c" into rvc-d1-dev-plus-aosp am: 83401fcd78
...
Change-Id: I262225e1932ef19a8043bf9eef1255420f78dfc2
2020-04-30 18:24:33 +00:00
Jeff Sharkey
aa273bc975
Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab am: 4e90b707f1 am: 3a827b2293
...
Change-Id: If291c6107d6f7393cbaac7a3cfdb2f897d074d92
2020-04-30 18:24:08 +00:00
Jeff Sharkey
760717a058
Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab am: 4e90b707f1 am: 8a96fca5dd
...
Change-Id: Ia2296e62560a5d1edb93090d2a722732a6db89ff
2020-04-30 18:24:04 +00:00
Wonsik Kim
21f9088e44
Merge "RELAND: "media: lazy MediaCodec.release()"" into rvc-dev am: c8a654c21a am: cadc5803db am: 444a9e551a
...
Change-Id: Ie55a43fead7eabea2dadb4b479de06bcc34248b5
2020-04-30 18:23:30 +00:00
Tiger Huang
29ea59f79c
Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d am: 282a713b1a
...
Change-Id: I58dcab9f984b8998609b4ac6ada8b9a0f2a3e4f8
2020-04-30 18:23:18 +00:00
Matt Pietal
677981d56b
Controls UI - Lock screen support
...
Show controls on the lock screen if the user has chosen to show
sensitive controls. All touches when locked should go through bouncer,
which will force a global dialog dismiss before proceeding.
Bug: 152531337
Fixes: 155402810
Fixes: 154669090
Test: manual
Change-Id: Ib5a305e58a40dd9df5ae2e0f74c5c9bad2edc976
2020-04-30 18:23:16 +00:00
Wonsik Kim
265699e7bb
Merge "RELAND: "media: lazy MediaCodec.release()"" into rvc-dev am: c8a654c21a am: cadc5803db am: c8c0935723
...
Change-Id: I521322946c52de3a962f7bb4de0554531c7be550
2020-04-30 18:23:05 +00:00
Tiger Huang
282a713b1a
Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d
...
Change-Id: I76a3e67aece7e28c3f410f11dad330591c2fe0ab
2020-04-30 18:10:56 +00:00
Tiger Huang
5bfc56f05c
Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d
...
Change-Id: I2fef89c2e1e20c17c51c20ccd5434ecc3b610b39
2020-04-30 18:10:25 +00:00
TreeHugger Robot
c30d5e09c0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 0cb42fc3da -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifebb89b744732541edb23cd068729aa894a858a3
2020-04-30 18:10:07 +00:00
Benedict Wong
27070ceaf3
Merge "Update MODP groups for IKEv2/IPsec VPNs" am: da820447b2 am: 928b1e7334 am: c0c67eeaf0
...
Change-Id: I5015dfabc132b2e5cd75ae35ec6e213164130023
2020-04-30 18:06:20 +00:00
Benedict Wong
4c190a8dcc
[automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 449bd6fe45 -s ours am: 763a9e39e1 -s ours
...
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 4fab295446
2020-04-30 18:06:04 +00:00
Benedict Wong
a97d067217
Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 449bd6fe45 am: 8994d9d736
...
Change-Id: I5e241625491b86f8e92836b4d5009b62f687472d
2020-04-30 18:05:45 +00:00
Automerger Merge Worker
95aba25382
Merge "Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab am: bc74668eec" into rvc-d1-dev-plus-aosp
2020-04-30 18:05:45 +00:00
Jeff Sharkey
fd7ead61eb
Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab am: bc74668eec
...
Change-Id: I31a5e0e3e9fe73fb19aae19c3c0909144d46acd7
2020-04-30 18:05:34 +00:00
Benedict Wong
4a5a9302f1
[automerger skipped] Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" into rvc-dev am: 449bd6fe45 am: 8994d9d736 -s ours
...
am skip reason: Change-Id I7e61a1612692db275b751330af5bacbf86836a8c with SHA-1 2ed005834f
2020-04-30 18:05:19 +00:00
Automerger Merge Worker
83401fcd78
Merge "Merge "RELAND: "media: lazy MediaCodec.release()"" into rvc-dev am: c8a654c21a am: 8e09576f0c" into rvc-d1-dev-plus-aosp
2020-04-30 18:04:53 +00:00
Jeff Sharkey
8a96fca5dd
Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab am: 4e90b707f1
...
Change-Id: I280aef961dec25188e99d7b92fe4a65dc1758e96
2020-04-30 18:04:45 +00:00
Jeff Sharkey
3a827b2293
Merge "Revert "Change to using sysprop for services.core.unboosted"" into rvc-dev am: 7811dc15ab am: 4e90b707f1
...
Change-Id: I5eb941fab450434da329eb4c5782a6e460a05e1b
2020-04-30 18:04:39 +00:00
Wonsik Kim
bd33071601
Merge "RELAND: "media: lazy MediaCodec.release()"" into rvc-dev am: c8a654c21a am: 8e09576f0c
...
Change-Id: Id8232016535e42167d089eebf94613fc4dbfea86
2020-04-30 18:04:39 +00:00
Benedict Wong
c0c67eeaf0
Merge "Update MODP groups for IKEv2/IPsec VPNs" am: da820447b2 am: 928b1e7334
...
Change-Id: I8fa71a4403fb10646bf087610791d90a32188b94
2020-04-30 18:04:35 +00:00
Wonsik Kim
c8c0935723
Merge "RELAND: "media: lazy MediaCodec.release()"" into rvc-dev am: c8a654c21a am: cadc5803db
...
Change-Id: I7d62e33aeccc4903fd3e17bbd140f3238c5b2e15
2020-04-30 18:04:17 +00:00
Wonsik Kim
444a9e551a
Merge "RELAND: "media: lazy MediaCodec.release()"" into rvc-dev am: c8a654c21a am: cadc5803db
...
Change-Id: I7376083d87dba78d574ab07846d3ecf3890bcc3e
2020-04-30 18:04:14 +00:00
Tiger Huang
b8ad491e6d
Merge "Ensure the requested insets state is up to date" into rvc-dev
2020-04-30 17:56:41 +00:00
