Android Build Merger (Role)
0f2f7a3c91
Merge "Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5 am: c1dceabb36" into qt-r1-dev-plus-aosp
2019-06-05 22:34:41 +00:00
Hui Yu
d74aa7dab1
Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5
...
am: c1dceabb36
2019-06-05 15:33:54 -07:00
Android Build Merger (Role)
164a2c7528
Merge "[automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a am: 883b12f4a0 -s ours am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 0d1014c9e3 is in history" into qt-r1-dev-plus-aosp
2019-06-05 22:33:47 +00:00
Android Build Merger (Role)
8aa3700f38
Merge "Merge "Do not include specific_mention sections in bugreports either." into qt-dev am: da7f7e0a32 am: 758800ef58" into qt-r1-dev-plus-aosp
2019-06-05 22:33:28 +00:00
David Sehr
8dbb0ea596
[automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a
...
am: 883b12f4a00d1014c9e3
2019-06-05 15:32:57 -07:00
Joe Onorato
1386650a59
Merge "Do not include specific_mention sections in bugreports either." into qt-dev am: da7f7e0a32
...
am: 758800ef58
2019-06-05 15:32:51 -07:00
Android Build Merger (Role)
5ebd857a49
Merge "Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev am: c8120d6d6a am: 8533a4cc62" into qt-r1-dev-plus-aosp
2019-06-05 22:32:45 +00:00
Winson Chung
79c0b37dd2
Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev am: c8120d6d6a
...
am: 8533a4cc62
2019-06-05 15:32:02 -07:00
Android Build Merger (Role)
c7fc462eb4
Merge "Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee am: 7e80654f56" into qt-r1-dev-plus-aosp
2019-06-05 22:31:56 +00:00
Android Build Merger (Role)
bdf9b7018e
Merge "Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev am: 4024769fd1 am: a8040cce98" into qt-r1-dev-plus-aosp
2019-06-05 22:31:54 +00:00
Kevin Chyn
3608e7ad42
Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev am: 4024769fd1
...
am: a8040cce98
2019-06-05 15:31:09 -07:00
Jovana Knezevic
ecb54c56b5
Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee
...
am: 7e80654f56
2019-06-05 15:31:08 -07:00
Mady Mellor
2a9c25564a
Merge "Post finishing after transition in onBackPressed" into qt-dev am: 57854d3b90
...
am: d562e7511b
2019-06-05 15:30:18 -07:00
Wale Ogunwale
e2d54d719c
Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev am: 2aa255a746
...
am: ccbe8239ae
2019-06-05 15:29:30 -07:00
Matt Casey
f56ab49a6c
Merge "Rendering fixes for assist handles." into qt-dev am: 075baa2e9b
...
am: 1bdee403fc
2019-06-05 15:28:35 -07:00
Lorenzo Colitti
2765cfb5e6
Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: e2fb127e41
...
am: b1d32ef751
2019-06-05 15:27:37 -07:00
Makoto Onuki
1f34785cf4
Merge "Fix slow query log." into qt-dev am: dee07f5d7f
...
am: e95419371a
2019-06-05 15:26:47 -07:00
Kevin Chyn
1cc9bbbe3a
Merge "Use real gatekeeper HAT for resetting lockout" into qt-r1-dev
...
am: fbd90d3dec
2019-06-05 15:26:04 -07:00
Govinda Wasserman
77791e0ce3
Merge "Fixes timestamp passed to the Assistant" into qt-r1-dev
...
am: 0ce43fa68c
2019-06-05 15:25:25 -07:00
Robert Snoeberger
32de62d8cf
Merge "Prevent clock-lock overlap with pulsing on AOD." into qt-r1-dev
...
am: 30a416fdea
2019-06-05 15:24:42 -07:00
Hongyi Zhang
f0d95b97ba
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d0453641
...
am: 01d0acfed0
2019-06-05 15:24:04 -07:00
Victor Hsieh
336c1a4596
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662
...
am: 00e482d84e
2019-06-05 15:23:13 -07:00
Joe Onorato
758800ef58
Merge "Do not include specific_mention sections in bugreports either." into qt-dev
...
am: da7f7e0a32
2019-06-05 15:22:40 -07:00
Lucas Dupin
883581f176
Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev
...
am: 9369357e1d
2019-06-05 15:22:28 -07:00
Kevin Chyn
a8040cce98
Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev
...
am: 4024769fd1
2019-06-05 15:20:52 -07:00
Govinda Wasserman
202b070e2b
Merge "Refactors logging into its own function" into qt-r1-dev
...
am: ab6d79eefd
2019-06-05 15:20:20 -07:00
Joe Onorato
da7f7e0a32
Merge "Do not include specific_mention sections in bugreports either." into qt-dev
2019-06-05 22:13:55 +00:00
Kevin Chyn
4024769fd1
Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev
2019-06-05 22:05:08 +00:00
Winson Chung
52b1251305
Merge "Ensure that the IME switcher button is always touchable" into qt-dev am: f106e0a8fa
...
am: c9dbc123ca
2019-06-05 14:54:11 -07:00
Winson Chung
c9dbc123ca
Merge "Ensure that the IME switcher button is always touchable" into qt-dev
...
am: f106e0a8fa
2019-06-05 14:48:14 -07:00
Winson Chung
f106e0a8fa
Merge "Ensure that the IME switcher button is always touchable" into qt-dev
2019-06-05 21:31:32 +00:00
Brian Duddie
fc06205561
Merge "Clarify documentation for sensor placement" into qt-dev am: 6e9c0741b5
...
am: 985f1299cf
2019-06-05 14:01:00 -07:00
Brian Duddie
985f1299cf
Merge "Clarify documentation for sensor placement" into qt-dev
...
am: 6e9c0741b5
2019-06-05 13:53:01 -07:00
Kevin Chyn
d1cdc3abc5
Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt
...
The layout should be focusable and be set to focused in order for the
back button events to be received, since the key listener is set on
the layout.
Fixes: 133781042
Test: Back button cancels authentication
Test: No regression in tests mentioned in the CL above
Change-Id: I7d78bea400e8791e296a53603414095cfca62ec1
2019-06-05 20:46:11 +00:00
TreeHugger Robot
6e9c0741b5
Merge "Clarify documentation for sensor placement" into qt-dev
2019-06-05 20:36:42 +00:00
Fabian Kozynski
92bee05891
Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev am: 15e2d7e50b
...
am: e0047318d6
2019-06-05 13:25:11 -07:00
Julia Reynolds
752efb1197
Merge "Read the subtext of noti guts field on selection" into qt-dev am: 8ef8577391
...
am: 09e8873efe
2019-06-05 13:22:49 -07:00
Matt Casey
ecf9bb5851
Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev am: 92d7f42baa
...
am: 6a07469e23
2019-06-05 13:18:57 -07:00
Fabian Kozynski
e0047318d6
Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev
...
am: 15e2d7e50b
2019-06-05 13:18:13 -07:00
Julia Reynolds
09e8873efe
Merge "Read the subtext of noti guts field on selection" into qt-dev
...
am: 8ef8577391
2019-06-05 13:15:53 -07:00
Lorenzo Colitti
c13520f53e
Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2
...
am: eabf2d0b8d
2019-06-05 13:13:24 -07:00
Matt Casey
6a07469e23
Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev
...
am: 92d7f42baa
2019-06-05 13:10:48 -07:00
Fabian Kozynski
15e2d7e50b
Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev
2019-06-05 20:10:09 +00:00
TreeHugger Robot
8ef8577391
Merge "Read the subtext of noti guts field on selection" into qt-dev
2019-06-05 20:00:32 +00:00
Lorenzo Colitti
eabf2d0b8d
Merge "Always prompt for limited connectivity." into qt-dev
...
am: 4a5a129fb2
2019-06-05 12:55:31 -07:00
Matt Casey
92d7f42baa
Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev
2019-06-05 19:02:35 +00:00
Joe Onorato
f7c2bceafe
Do not include specific_mention sections in bugreports either.
...
Test: adb bugreport & manually verify
Bug: 134583922
Change-Id: I6b4df17fc729f78e70e126882bce611a33c8ef9a
2019-06-05 11:57:39 -07:00
TreeHugger Robot
4a5a129fb2
Merge "Always prompt for limited connectivity." into qt-dev
2019-06-05 18:50:32 +00:00
Brian Duddie
086d840d74
Clarify documentation for sensor placement
...
Update documentation to be in sync with new language added to HAL
interface, which better explains the expected payload, format, and
usage.
Fixes: 133264933
Test: make docs, view HTML
Change-Id: Ib602674d395cb8c8e6431d23b051685c8d172560
2019-06-05 11:44:44 -07:00
Xiangyu/Malcolm Chen
ebfa265e01
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: b613fec2f8
...
am: da3dad46d0
2019-06-05 11:35:01 -07:00
