Pengquan Meng
e99edb8a91
[automerger skipped] Merge "Support maximum wait time for Cell broadcast" am: 156f347db4 am: 0362123033 am: 90247580a7
...
am: 7af3d7f0c002d6ac0f20
2019-09-06 14:49:01 -07:00
Erin Yan
c5728033af
[automerger skipped] Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev am: 46e4dd099c
...
am: 06ab601fef13ae817be2
2019-09-06 14:41:40 -07:00
Pengquan Meng
7af3d7f0c0
Merge "Support maximum wait time for Cell broadcast" am: 156f347db4 am: 0362123033
...
am: 90247580a7
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
2019-09-06 14:27:25 -07:00
Pengquan Meng
90247580a7
Merge "Support maximum wait time for Cell broadcast" am: 156f347db4
...
am: 0362123033
2019-09-06 14:22:00 -07:00
TreeHugger Robot
04e80fa640
Merge "Don't start first human user twice on headless-system mode."
2019-09-06 21:05:12 +00:00
Chavi Weingarten
c4ee1101f5
Merge "Remove setGeometryAppliesWithResize"
2019-09-06 20:18:21 +00:00
Eugene Susla
f5695a7725
[automerger skipped] Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev am: 299cd3ccae
...
am: 13cfe928a3
2019-09-06 12:59:00 -07: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
f481322819
[automerger skipped] [DO NOT MERGE] Copy appop modes on write to avoid locked IO am: 3454f3e9f9
...
am: 48d07322f4
2019-09-06 12:56:01 -07:00
Beverly
5e9cb4d574
Merge "Fix zen alarms only mode check" into qt-qpr1-dev am: 9c81f1754c
...
am: f50e3d227e
2019-09-06 12:52:27 -07:00
Bernardo Rufino
ffdc7d9b35
Merge "Don't consider tasks with INITIALIZING top activity as visible"
2019-09-06 19:43:13 +00:00
Eugene Susla
13cfe928a3
Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev
...
am: 299cd3ccae
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
2019-09-06 12:42:58 -07:00
Beverly
f50e3d227e
Merge "Fix zen alarms only mode check" into qt-qpr1-dev
...
am: 9c81f1754c
2019-09-06 12:38:07 -07:00
Miranda Kephart
c2e91d6dcb
Merge "Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545"
2019-09-06 19:30:55 +00: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
Erin Yan
693b47af0c
[automerger skipped] Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev am: 7ca7382a6e
...
am: 9af8bb479dfe3efb667f
2019-09-06 11:49:18 -07:00
Erin Yan
9af8bb479d
Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev
...
am: 7ca7382a6e
2019-09-06 11:35:50 -07:00
Lucas Dupin
0d1b51e5d5
Merge "Fix default wallpaper transition issue" into qt-qpr1-dev am: 8de3b785c4
...
am: c29e70ef63
2019-09-06 11:32:34 -07:00
Blake Kragten
4a2420a2f7
Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev am: cf1268a5f5
...
am: da96cb4086
2019-09-06 11:28:34 -07:00
Miranda Kephart
70ff3fb971
Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545
...
Test: manual; presubmit on source branch
Change-Id: Ibc2bb3a04ee5605660ff4f2cf762af499db237c8
2019-09-06 18:27:58 +00:00
Varun Shah
ea424deee9
Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev am: eff156093c
...
am: a5c53a01ae
2019-09-06 11:25:35 -07:00
Jonathan Scott
b5e96b176b
[automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 68f73efcb9 am: 00386d79f5 -s ours
...
am: d43aa31232fb77e63aa5
2019-09-06 11:20:13 -07:00
Erin Yan
be20b487bd
[automerger skipped] Remove PASSWORD_QUALITY_MANAGED from CarTrustAgentUnlockDialogHelper am: b1af47bec8
...
am: 42780634677bed781be5
2019-09-06 11:18:17 -07:00
Heemin Seog
ba355da4ce
[automerger skipped] Merge "Handle USB eject and unmount via Car Settings" into qt-qpr1-dev am: 59db7b8d01
...
am: c799b2dcb091fab5cb44
2019-09-06 11:14:41 -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
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
TreeHugger Robot
2257e8b62d
Merge "int userHandle -> int userId"
2019-09-06 18:08:08 +00:00
Lucas Dupin
c29e70ef63
Merge "Fix default wallpaper transition issue" into qt-qpr1-dev
...
am: 8de3b785c4
2019-09-06 11:07:36 -07:00
Erin Yan
b7eca93a5f
[automerger skipped] Merge "Create dialog to show detecting Batmobile device & unlocking" into qt-qpr1-dev am: cf885ef399
...
am: 80d3b193eb16258e3e98
2019-09-06 11:04:22 -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
2019-09-06 11:03:30 -07:00
Colin Cross
fe163c6f7d
Merge changes from topic "protobuf-3.9.1"
...
* changes:
Convert statsd_test and statsd_benchmark to proto lite
Adapt to google::protobuf::uint64 type change
2019-09-06 18:01:08 +00:00
Varun Shah
a5c53a01ae
Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev
...
am: eff156093c
2019-09-06 10:59:13 -07:00
Pinyao Ting
f747a43df2
[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: 4351f32689a6364d92ed
2019-09-06 10:55:22 -07:00
Jonathan Scott
d43aa31232
[automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 68f73efcb9
...
am: 00386d79f5a5e4422d14
2019-09-06 10:53:38 -07:00
Erin Yan
4278063467
Remove PASSWORD_QUALITY_MANAGED from CarTrustAgentUnlockDialogHelper
...
am: b1af47bec8
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
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
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: a86312e067a6364d92ed
2019-09-06 10:43:17 -07:00
Pengquan Meng
0362123033
Merge "Support maximum wait time for Cell broadcast"
...
am: 156f347db4
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
Bookatz
f56f258495
int userHandle -> int userId
...
Throughout the codebase, sometimes an integer user ID is called
userId, and sometimes it is called userHandle. Here, we rename the
occurences of "int userHandle" to "int userId" in select files.
Additionally, we add the @UserIdInt annotation in many more places.
This certainly does not cover all uses of userHandle, which is used
widely throughout Android; doing so would be more dangerous and cause
merge conflicts. But at least the core User code can have a consistent
nomenclature.
Bug: 138384792
Test: compiles. presubmit passes.
Change-Id: I9a2684e9bfac637e0476c4b68027008ebb8a160b
2019-09-06 09:26:35 -07:00
Jimmy Chen
aa62e30c8d
Merge "ocsp: add OCSP field in WifiEnterpriseConfig"
2019-09-06 16:15:04 +00:00
TreeHugger Robot
eff156093c
Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev
2019-09-06 16:00:48 +00:00
Al Sutton
8d098c28c6
Merge "Move backup encryption to separate APK"
2019-09-06 14:57:27 +00:00
