Jonathan Scott
b6fc557eab
[automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 68f73efcb9 -s ours
...
am: 593b6f2478 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 a5e4422d14 is in history
Change-Id: I903b2f1c74ebc6742de3bf32760187e84da46964
2019-09-08 18:41:45 -07:00
Pinyao Ting
04b156593a
[automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours am: 122636b4f5 -s ours
...
am: 08c1dc2d66 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 2b415a4c44 is in history
Change-Id: I971fd790e6541f7ccc62cc1ed40b261c42a9a43b
2019-09-08 18:34:37 -07:00
Jonathan Scott
593b6f2478
[automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3
...
am: 68f73efcb9 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 a5e4422d14 is in history
Change-Id: Ied9dcb2ef947d5c9000f560ff099cc9d8a3ac066
2019-09-08 18:28:03 -07:00
Pinyao Ting
08c1dc2d66
[automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours
...
am: 122636b4f5 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 46368e4f5c is in history
Change-Id: Ib0d54c9737f9e03624436a35fd6d27bd420291b3
2019-09-08 18:22:42 -07:00
Da Xing
5d46ef370e
Merge "Crash app on foreground service notification error." am: 036ea39d96 am: ebf0ccf2dc
...
am: 7dc7622d5f
Change-Id: Icf725c22df4041be24fc68bdfd854887d3e8c9be
2019-09-06 22:22:01 -07:00
Da Xing
7dc7622d5f
Merge "Crash app on foreground service notification error." am: 036ea39d96
...
am: ebf0ccf2dc
Change-Id: Ib0312f964bc8d67aec37143e955a36fb919130cc
2019-09-06 22:14:31 -07:00
Da Xing
ebf0ccf2dc
Merge "Crash app on foreground service notification error."
...
am: 036ea39d96
Change-Id: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-06 22:07:05 -07:00
Treehugger Robot
036ea39d96
Merge "Crash app on foreground service notification error."
2019-09-07 04:47:45 +00:00
James O'Leary
8de0b9defe
Merge "Add completion handler for ScreenshotHelper" into qt-qpr1-dev
...
am: 8a91775d3f
Change-Id: Id8a8c4ed61c269a2731d056deab96b38e3bbd583
2019-09-06 21:10:31 -07:00
James O'Leary
8a91775d3f
Merge "Add completion handler for ScreenshotHelper" into qt-qpr1-dev
2019-09-07 03:42:36 +00:00
Mehdi Alizadeh
40a6b47ff9
Merge "Check for component availability before all AppPrediction logic" into qt-qpr1-dev
...
am: ae4ab469bf
Change-Id: I802a131a3503348ae107f37a380e3e78c9e0e2cf
2019-09-06 18:20:27 -07:00
Mehdi Alizadeh
ae4ab469bf
Merge "Check for component availability before all AppPrediction logic" into qt-qpr1-dev
2019-09-07 00:53:30 +00:00
Pengquan Meng
b5d4ff67d6
[automerger skipped] Merge "Support maximum wait time for Cell broadcast" into qt-qpr1-dev
...
am: c12bf8a9e0 -s ours
am skip reason: change_id If3d8d7915f2d86da20c63e99bee01f30e3ea89c0 with SHA1 9f677a0790 is in history
Change-Id: Iffad6f1039daa8a6c8f53ef6b7bfd96d674819ee
2019-09-06 16:30:26 -07:00
Pengquan Meng
6b83389f35
[automerger skipped] Support maximum wait time for Cell broadcast
...
am: 1e1099a123 -s ours
am skip reason: change_id If3d8d7915f2d86da20c63e99bee01f30e3ea89c0 with SHA1 9f677a0790 is in history
Change-Id: Icdd16f0ebe762d5a07f85bb62af0c7e63ac677c2
2019-09-06 16:22:36 -07:00
Pengquan Meng
c12bf8a9e0
Merge "Support maximum wait time for Cell broadcast" into qt-qpr1-dev
2019-09-06 23:07:37 +00:00
Eric Holk
b79c764c82
Merge "[view compiler] Add test coverage for layouts compiled from APK" am: a2b218db06 am: 9142ac8119
...
am: efa011f8a3
Change-Id: I5504845897c0d7eccb5a94a0cf0bd4a57aa78ba1
2019-09-06 15:12:09 -07:00
Brad Ebinger
384b50304f
Merge "Re-deprecating Capabilities in ImsFeature" am: f4cd3de77a am: 36d3aa0e02
...
am: 86d97445cf
Change-Id: I405d270b964f93e643b1630250bc09dda229987a
2019-09-06 14:56:40 -07:00
Eric Holk
efa011f8a3
Merge "[view compiler] Add test coverage for layouts compiled from APK" am: a2b218db06
...
am: 9142ac8119
Change-Id: I35a74d2ed6c1920672b61981a9d6b40b3b089495
2019-09-06 14:49:05 -07:00
Brad Ebinger
86d97445cf
Merge "Re-deprecating Capabilities in ImsFeature" am: f4cd3de77a
...
am: 36d3aa0e02
Change-Id: Id9ea164e537b6f12b2af02f2833b0f95d3391e1c
2019-09-06 14:33:57 -07:00
Pengquan Meng
7af3d7f0c0
Merge "Support maximum wait time for Cell broadcast" am: 156f347db4 am: 0362123033
...
am: 90247580a7
Change-Id: Ia785431a50d6fa6343a6cd67b31f57416004ad51
2019-09-06 14:33:39 -07:00
Erin Yan
06ab601fef
Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev
...
am: 46e4dd099c
Change-Id: Ifc668b6004946f1669f8c5e57bca697276edb820
2019-09-06 14:27:25 -07:00
Eric Holk
9142ac8119
Merge "[view compiler] Add test coverage for layouts compiled from APK"
...
am: a2b218db06
Change-Id: I4e6e938ea8f831182550966ea7cfccb258fb05ca
2019-09-06 14:26:37 -07:00
Pengquan Meng
90247580a7
Merge "Support maximum wait time for Cell broadcast" am: 156f347db4
...
am: 0362123033
Change-Id: I08d29451c56e9f0405399eddbc3c4fc662ee1b6a
2019-09-06 14:22:00 -07:00
Treehugger Robot
a2b218db06
Merge "[view compiler] Add test coverage for layouts compiled from APK"
2019-09-06 20:40:22 +00:00
TreeHugger Robot
46e4dd099c
Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev
2019-09-06 19:58:47 +00:00
Eugene Susla
13cfe928a3
Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev
...
am: 299cd3ccae
Change-Id: Ie9de464aab5eeef35118fc0711b0c15fcec0e88f
2019-09-06 12:43:03 -07:00
Eugene Susla
48d07322f4
[DO NOT MERGE] Copy appop modes on write to avoid locked IO
...
am: 3454f3e9f9
Change-Id: I4bb98a81ca8e1ea78448e5a7097b9577d62fc92c
2019-09-06 12:42:58 -07:00
Beverly
f50e3d227e
Merge "Fix zen alarms only mode check" into qt-qpr1-dev
...
am: 9c81f1754c
Change-Id: Icc9bff293fec3cf4ddd4255b74a4709b249bb7e9
2019-09-06 12:38:07 -07:00
Mehdi Alizadeh
5cc5f713f9
Check for component availability before all AppPrediction logic
...
Bug: 138595943
Test: Manual test by removing the AiAi package from device
Change-Id: I9d1e5be52e8ca5fadce2d3107279fa77d488f697
2019-09-06 12:23:44 -07:00
TreeHugger Robot
299cd3ccae
Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev
2019-09-06 19:21:56 +00:00
TreeHugger Robot
9c81f1754c
Merge "Fix zen alarms only mode check" into qt-qpr1-dev
2019-09-06 19:21:32 +00:00
Brad Ebinger
36d3aa0e02
Merge "Re-deprecating Capabilities in ImsFeature"
...
am: f4cd3de77a
Change-Id: I3dab955f70d6f4027f79cefc3b9d35c1cbfffaa6
2019-09-06 12:11:35 -07:00
Brad Ebinger
f4cd3de77a
Merge "Re-deprecating Capabilities in ImsFeature"
2019-09-06 18:55:17 +00:00
Erin Yan
9af8bb479d
Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev
...
am: 7ca7382a6e
Change-Id: I6fe2e01cd5c11f29d3ad5427502295daf629ab46
2019-09-06 11:35:50 -07:00
Erin Yan
bc4b741979
Reduce the delay of showing unlock dialog to 0
...
Bug: 136049501
Test: Manually on IHU
Change-Id: I0016290a5181b9acba73503f938772b90f583f66
Merged-in: I0016290a5181b9acba73503f938772b90f583f66
(cherry picked from commit 13ae817be2 )
2019-09-06 18:12:57 +00:00
James O'Leary
fa5bb7af25
Add completion handler for ScreenshotHelper
...
The Next-Generation Assistant can call SysUI to request a screenshot.
Adding an indicator that a screenshot has completed successfully enables
the Next-Generation Assistant to show the assistant UI again once the
screenshot has completed.
Bug: 137201206
Bug: 131082115
Test: Wired up SysUIG's NGA integration's touch outside handler to call
take screenshot, confirmed it behaved as expected when a touch outside
occurred.
Change-Id: Ie83af6c9dd8e93b3e18a820d79c02125a19bd62a
2019-09-06 18:11:38 +00:00
TreeHugger Robot
7ca7382a6e
Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev
2019-09-06 18:11:10 +00:00
Lucas Dupin
c29e70ef63
Merge "Fix default wallpaper transition issue" into qt-qpr1-dev
...
am: 8de3b785c4
Change-Id: I730392200e589e97192e1612ce7517ba2d6c93e1
2019-09-06 11:07:36 -07:00
Blake Kragten
da96cb4086
Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev
...
am: cf1268a5f5
Change-Id: I294286840c969fba42ff2814423ae4dbd81a8577
2019-09-06 11:03:30 -07:00
Varun Shah
a5c53a01ae
Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev
...
am: eff156093c
Change-Id: Iece7adc8dd9a3cb5c704e917b22337cf8339f460
2019-09-06 10:59:13 -07:00
Jonathan Scott
d43aa31232
[automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 68f73efcb9
...
am: 00386d79f5 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 a5e4422d14 is in history
Change-Id: I3a0dbdfc2de586cbb7dbeb0d0d9fd34535323b42
2019-09-06 10:53:38 -07:00
Erin Yan
4278063467
Remove PASSWORD_QUALITY_MANAGED from CarTrustAgentUnlockDialogHelper
...
am: b1af47bec8
Change-Id: Ib569c5cf238e196deec26f65662e437b7db05510
2019-09-06 10:50:34 -07:00
Heemin Seog
c799b2dcb0
Merge "Handle USB eject and unmount via Car Settings" into qt-qpr1-dev
...
am: 59db7b8d01
Change-Id: Ia01b9fe95c175f242b771fa1cb1b33bceecda896
2019-09-06 10:49:43 -07:00
Erin Yan
80d3b193eb
Merge "Create dialog to show detecting Batmobile device & unlocking" into qt-qpr1-dev
...
am: cf885ef399
Change-Id: Ib7d8a17d32690414b34e646df631c78c167593eb
2019-09-06 10:48:27 -07:00
Pinyao Ting
4351f32689
[automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours am: 122636b4f5 -s ours
...
am: a86312e067 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history
Change-Id: Id35626673047fae9dc53de1633685eb2fc1c3994
2019-09-06 10:43:17 -07:00
Pengquan Meng
0362123033
Merge "Support maximum wait time for Cell broadcast"
...
am: 156f347db4
Change-Id: Id6bdf363bc2819e2e16a9ee2b67e0ab449e5c09d
2019-09-06 10:39:37 -07:00
Beverly
dcc5cfc561
Fix zen alarms only mode check
...
Also fixes setting the consolidated zen policy logging.
Fixes: 140329813
Test: android.app.cts.NotificationManagerTest#testTotalSilenceOnlyMuteStreams
Test: android.app.cts.NotificationManagerTest#testAlarmsOnlyMuteStreams
Change-Id: I43d503ac23d7b0b141930d77cb76f1f589b22525
2019-09-06 17:25:47 +00:00
Lucas Dupin
8de3b785c4
Merge "Fix default wallpaper transition issue" into qt-qpr1-dev
2019-09-06 17:16:23 +00:00
Pengquan Meng
156f347db4
Merge "Support maximum wait time for Cell broadcast"
2019-09-06 17:15:28 +00:00
Blake Kragten
cf1268a5f5
Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev
2019-09-06 17:03:30 +00:00