Joe Onorato
ca6b608cff
Merge "Merge "Do not include specific_mention sections in bugreports either." into qt-dev am: da7f7e0a32 am: 758800ef58" into qt-r1-dev-plus-aosp
...
am: 8aa3700f38
Change-Id: I059a0bb7a85773dc562b09546fa1c49316b0a812
2019-06-05 16:02:46 -07:00
Winson Chung
6f7193f0d6
Merge "Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev am: c8120d6d6a am: 8533a4cc62" into qt-r1-dev-plus-aosp
...
am: 5ebd857a49
Change-Id: I6eaaa2df293ce55a2b0a19e4c639065f5fc920ee
2019-06-05 16:01:03 -07:00
Jovana Knezevic
158beabe1e
Merge "Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee am: 7e80654f56" into qt-r1-dev-plus-aosp
...
am: c7fc462eb4
Change-Id: Ica7f171d057a8e7150fb91b16c7050719bd3f9f1
2019-06-05 15:59:00 -07:00
Kevin Chyn
658fe4a003
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
...
am: bdf9b7018e
Change-Id: I2eafec8ade5bb20d86e697b7b1871824fe143c12
2019-06-05 15:57:11 -07:00
Mady Mellor
01f9115864
Merge "Post finishing after transition in onBackPressed" into qt-dev am: 57854d3b90 am: d562e7511b
...
am: 2a9c25564a
Change-Id: Id6975d3d7b12d4084a9ee407898292d204dda150
2019-06-05 15:55:09 -07:00
Wale Ogunwale
7216476234
Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev am: 2aa255a746 am: ccbe8239ae
...
am: e2d54d719c
Change-Id: I52c29b8797b24da797518ba36439e71f969152fb
2019-06-05 15:53:35 -07:00
Matt Casey
1fe9d62b4b
Merge "Rendering fixes for assist handles." into qt-dev am: 075baa2e9b am: 1bdee403fc
...
am: f56ab49a6c
Change-Id: I6d8f30840663d3de9937d1c7b6b95eeaa54e5f9f
2019-06-05 15:51:51 -07:00
Lorenzo Colitti
45615cece6
Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: e2fb127e41 am: b1d32ef751
...
am: 2765cfb5e6
Change-Id: I49108826b5702a821d3078cdac836e6b5c73d540
2019-06-05 15:50:03 -07:00
Android Build Merger (Role)
921310eed5
Merge "Merge "Fix slow query log." into qt-dev am: dee07f5d7f am: e95419371a am: 1f34785cf4"
2019-06-05 22:49:06 +00:00
TreeHugger Robot
fa683ea249
Merge "Add shell command to toggle DND"
2019-06-05 22:48:57 +00:00
Makoto Onuki
75d31212c3
Merge "Fix slow query log." into qt-dev am: dee07f5d7f am: e95419371a
...
am: 1f34785cf4
Change-Id: Iee00fbb4dccc8c43e1a6905dd923f1a96d101a7c
2019-06-05 15:48:17 -07:00
Kevin Chyn
e61a0cd2e5
Merge "Use real gatekeeper HAT for resetting lockout" into qt-r1-dev am: fbd90d3dec
...
am: 1cc9bbbe3a
Change-Id: Iad65e903224e292766abb12ea8bcebfde5a49520
2019-06-05 15:46:36 -07:00
Govinda Wasserman
d5f1478940
Merge "Fixes timestamp passed to the Assistant" into qt-r1-dev am: 0ce43fa68c
...
am: 77791e0ce3
Change-Id: I04b189b1eb558fc1a8f1b3aaf3eda850659d39e3
2019-06-05 15:44:33 -07:00
Robert Snoeberger
3c57979674
Merge "Prevent clock-lock overlap with pulsing on AOD." into qt-r1-dev am: 30a416fdea
...
am: 32de62d8cf
Change-Id: I86dccb0edfe013b103bc2a0bd5697deadf45b516
2019-06-05 15:42:46 -07:00
Hongyi Zhang
48ecd4a2bb
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d0453641 am: 01d0acfed0
...
am: f0d95b97ba
Change-Id: I16c574cb5f7bbcc823b0ace4bf2efaac36e96940
2019-06-05 15:41:14 -07:00
Victor Hsieh
5064495283
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662 am: 00e482d84e
...
am: 336c1a4596
Change-Id: I4d3d3a6d4e1e98e44346230a44f48e635e3c0507
2019-06-05 15:39:35 -07:00
Lucas Dupin
453177e631
Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev am: 9369357e1d
...
am: 883581f176
Change-Id: Ic7136202d2d3b3ae48c0815e36d1e7a964736d03
2019-06-05 15:37:51 -07: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
Joe Onorato
1386650a59
Merge "Do not include specific_mention sections in bugreports either." into qt-dev am: da7f7e0a32
...
am: 758800ef58
Change-Id: If704a45ab2b4858bbb220d43af0ad5c8d7333030
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
Change-Id: I67baacee7f41852f50e7b325f35c3ecbe038002a
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
Change-Id: If2b8cd646275f77f8d17099fd3a728c551fd9c3c
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
Change-Id: I860520d24575bd80a93cac175b7941ee6c7685b9
2019-06-05 15:31:08 -07:00
Govinda Wasserman
de17732181
Merge "Refactors logging into its own function" into qt-r1-dev am: ab6d79eefd
...
am: 202b070e2b
Change-Id: I91bcb966666a7d6512925e190c19d992fb049f09
2019-06-05 15:31:00 -07:00
Mady Mellor
2a9c25564a
Merge "Post finishing after transition in onBackPressed" into qt-dev am: 57854d3b90
...
am: d562e7511b
Change-Id: Iab56329a4688f24c03e613f4a712bb6a1c45814a
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
Change-Id: I0538320701a64cdc9c4712d2f8b620c05a09f8c5
2019-06-05 15:29:30 -07:00
Matt Casey
f56ab49a6c
Merge "Rendering fixes for assist handles." into qt-dev am: 075baa2e9b
...
am: 1bdee403fc
Change-Id: If2f17730179bb43ca6d7e5f32125b3fbdcaccd54
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
Change-Id: Iee2af3679bbb8ef507855849cdccdf4d0fda9da3
2019-06-05 15:27:37 -07:00
Makoto Onuki
1f34785cf4
Merge "Fix slow query log." into qt-dev am: dee07f5d7f
...
am: e95419371a
Change-Id: I9937a8851771e9bbf03210eaedf7601432ddca44
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
Change-Id: I45fc9c6f6e27dab8e47c4a7e98ccd6a02a3a5734
2019-06-05 15:26:04 -07:00
Govinda Wasserman
77791e0ce3
Merge "Fixes timestamp passed to the Assistant" into qt-r1-dev
...
am: 0ce43fa68c
Change-Id: I09cfe4c9c151876b8f62645b7c2c0a03b265a8b6
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
Change-Id: I239e7cd8697f8015295ccda938eed9c3f9a0c01d
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
Change-Id: I5a2e8ba2b59863476395291834efcd671554d304
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
Change-Id: I426558687b9154919df33f91d57985c3c8960435
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
Change-Id: Ife90d8219bb85934bab81258faec5d7243e7e207
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
Change-Id: I2591f861e338dda0d667874103e89c3833f707f8
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
Change-Id: I2f4c161376927cb526419fadb195c155a67b7e3b
2019-06-05 15:20:52 -07:00
Govinda Wasserman
202b070e2b
Merge "Refactors logging into its own function" into qt-r1-dev
...
am: ab6d79eefd
Change-Id: I27052fa2790eaf161e1e76dd7763ec0da1b05285
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
Winson Chung
327dc451ee
Merge "Ensure that the IME switcher button is always touchable" into qt-dev am: f106e0a8fa am: c9dbc123ca
...
am: 52b1251305
Change-Id: I34f317596f1745f5cdd42e8ff163171d45286dd4
2019-06-05 15:11:03 -07: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
Change-Id: Icfef97e30b8c7d95aec8f63244f8e29d8f42cdd7
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
Change-Id: I00f6aa22ba7569e3980b1c086ebdf55b1a773911
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
cf2ff61cce
Merge "Clarify documentation for sensor placement" into qt-dev am: 6e9c0741b5 am: 985f1299cf
...
am: fc06205561
Change-Id: I0a33e5c0f1a258d729fe06bbb8da6d6e44fa4fe4
2019-06-05 14:06:45 -07:00
Brian Duddie
fc06205561
Merge "Clarify documentation for sensor placement" into qt-dev am: 6e9c0741b5
...
am: 985f1299cf
Change-Id: Ibb11b813ccd32d6ae986baf0385d7cb4b90e07dd
2019-06-05 14:01:00 -07:00
Brian Duddie
985f1299cf
Merge "Clarify documentation for sensor placement" into qt-dev
...
am: 6e9c0741b5
Change-Id: I56695e9ea76f802b171c47fbb3f2dead651eb697
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