Jerry Chang
f41712468f
Merge "Prevents posting multiple pulse requests at the same time" into qt-r1-dev
...
am: 7e5e70df58
2019-06-22 17:19:05 -07:00
Kevin Chyn
9b1716fa44
Merge "Dump buffer of authentication events for bugreports" into qt-r1-dev
...
am: 62a7af3f50
2019-06-22 17:17:21 -07:00
TreeHugger Robot
7e5e70df58
Merge "Prevents posting multiple pulse requests at the same time" into qt-r1-dev
2019-06-22 11:58:41 +00:00
Kevin Chyn
62a7af3f50
Merge "Dump buffer of authentication events for bugreports" into qt-r1-dev
2019-06-22 08:29:29 +00:00
Android Build Merger (Role)
a615045db0
Merge "[automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev am: 23b6339ebd -s ours am: 5cb9683fd7 -s ours am skip reason: change_id I88edd5a590f46b961c986ef0bf24585b3c2cf4a1 with SHA1 37ca693d78 is in history" into qt-r1-dev-plus-aosp
2019-06-22 02:03:09 +00:00
Youming Ye
c93fe03275
[automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev am: 23b6339ebd -s ours
...
am: 5cb9683fd737ca693d78
2019-06-21 19:01:00 -07:00
Youming Ye
519017ef99
[automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev am: 23b6339ebd
...
am: c6931e3fbb37ca693d78
2019-06-21 18:59:59 -07:00
Kevin Chyn
9bc1d495ee
Dump buffer of authentication events for bugreports
...
Last 100 events, plus total accumulated latencies for accept, reject,
and individual errors since last boot.
Fixes: 134429201
Test: adb shell dumpsys face
Change-Id: Idc34143a8e5de1036bb2d82767cf748c15b74822
2019-06-21 18:09:24 -07:00
Robert Carr
45db8e4ccc
Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev am: 6397ab05f9
...
am: 9e4b7a3f8d
2019-06-21 17:44:59 -07:00
Robert Carr
52277fd25e
Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev am: 6397ab05f9
...
am: 641d4f27e3
2019-06-21 17:42:23 -07:00
Youming Ye
5cb9683fd7
[automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev
...
am: 23b6339ebd37ca693d78
2019-06-21 17:42:16 -07:00
Youming Ye
c6931e3fbb
Merge "Add carrier config for conference participants data support" into qt-dev
...
am: 23b6339ebd
2019-06-21 17:33:29 -07:00
Robert Carr
641d4f27e3
Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev
...
am: 6397ab05f9
2019-06-21 17:32:54 -07:00
Robert Carr
9e4b7a3f8d
Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev
...
am: 6397ab05f9
2019-06-21 17:30:57 -07:00
Kevin Chyn
896bcc17f6
Merge "Scale the work profile background properly" into qt-r1-dev
...
am: 7473e8fda9
2019-06-21 17:24:34 -07:00
Bill Yi
8124aebfac
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: e5039d3c9f
2019-06-21 17:17:31 -07:00
TreeHugger Robot
23b6339ebd
Merge "Add carrier config for conference participants data support" into qt-dev
2019-06-22 00:12:34 +00:00
TreeHugger Robot
6397ab05f9
Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev
2019-06-22 00:04:19 +00:00
Amit Mahajan
0c1364eb67
Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff am: ab90035993
...
am: 3d5285c16b
2019-06-21 16:52:17 -07:00
Kevin Chyn
7473e8fda9
Merge "Scale the work profile background properly" into qt-r1-dev
2019-06-21 23:51:18 +00:00
Amit Mahajan
3d5285c16b
Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff
...
am: ab90035993
2019-06-21 16:46:15 -07:00
TreeHugger Robot
e5039d3c9f
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-21 23:45:39 +00:00
Dave Mankoff
4ae5be910d
Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-r1-dev
...
am: 0cd732ddf3
2019-06-21 16:40:15 -07:00
Dave Mankoff
e941dd8918
DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType.
...
am: 84c07e9f1a
2019-06-21 16:40:12 -07:00
Amit Mahajan
ab90035993
Merge "Set mOriginatingAddress and mRecipientAddress separately"
...
am: 44ea78d8ff
2019-06-21 16:39:09 -07:00
Dave Mankoff
0cd732ddf3
Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-r1-dev
2019-06-21 23:31:19 +00:00
Amit Mahajan
44ea78d8ff
Merge "Set mOriginatingAddress and mRecipientAddress separately"
2019-06-21 23:23:12 +00:00
Android Build Merger (Role)
04cd81fda7
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours am: af16a228a2 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-06-21 22:31:39 +00:00
Bill Yi
fa90167dcb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours
...
am: af16a228a2
2019-06-21 15:30:33 -07:00
Bill Yi
40ba79442f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours
...
am: 772a340689
2019-06-21 15:30:17 -07:00
Youming Ye
60b023bfd0
Add carrier config for conference participants data support
...
Bug: 132312382
Test: Manual
Change-Id: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
Merged-In: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
2019-06-21 22:30:08 +00:00
Android Build Merger (Role)
8f0c3ac7c6
Merge "Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43 am: b3be57b74c" into qt-r1-dev-plus-aosp
2019-06-21 22:28:36 +00:00
Aran Ink
19c65b97d2
Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43
...
am: b3be57b74c
2019-06-21 15:27:46 -07:00
Aran Ink
49a40df62a
Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43
...
am: 43369ea648
2019-06-21 15:27:42 -07:00
Bill Yi
772a340689
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 019e1bf3fb
2019-06-21 15:21:23 -07:00
Bill Yi
af16a228a2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 019e1bf3fb
2019-06-21 15:21:21 -07:00
Aran Ink
43369ea648
Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev
...
am: 985f21dd43
2019-06-21 15:18:29 -07:00
Aran Ink
b3be57b74c
Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev
...
am: 985f21dd43
2019-06-21 15:18:28 -07:00
TreeHugger Robot
019e1bf3fb
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-21 22:05:31 +00:00
TreeHugger Robot
985f21dd43
Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev
2019-06-21 22:00:47 +00:00
Kevin Chyn
b4523b39de
Scale the work profile background properly
...
Fixes: 135742033
Test: Set up work profile, use BiometricPromptDemo on both profiles
Background is not cut off on top / bottom anymore
Change-Id: I40476782c6b38a3562136d6ad0d2f465074dcfc1
2019-06-21 14:16:20 -07:00
Andreas Gampe
89e543fe54
Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5 am: 70ad27cfb5
...
am: e4a6ca7231
2019-06-21 13:57:26 -07:00
Andreas Gampe
e4a6ca7231
Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5
...
am: 70ad27cfb5
2019-06-21 13:52:40 -07:00
Andreas Gampe
70ad27cfb5
Merge changes Ie70d0155,I0692a91d,I8c5041a4
...
am: 4507201da5
2019-06-21 13:46:38 -07:00
Dave Mankoff
84c07e9f1a
DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType.
...
Test: atest SystemUITests
Bug: 111394067
Change-Id: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
2019-06-21 20:43:14 +00:00
Andreas Gampe
4507201da5
Merge changes Ie70d0155,I0692a91d,I8c5041a4
...
* changes:
LockAgent: Add agent parameters to start_lock_agent script
LockAgent: Add option to synthesize Java crash logging
LockAgent: Add ability to generate a native crash
2019-06-21 20:26:43 +00:00
Android Build Merger (Role)
ba65adf46b
Merge "Merge "media: clarify frame dropping behavior for decoder output" into qt-dev am: cfb6f93443 am: 46cb9bed22" into qt-r1-dev-plus-aosp
2019-06-21 19:57:20 +00:00
Lajos Molnar
54afba84dd
Merge "media: clarify frame dropping behavior for decoder output" into qt-dev am: cfb6f93443
...
am: 46cb9bed22
2019-06-21 12:56:39 -07:00
Lajos Molnar
83cfaf6d07
Merge "media: clarify frame dropping behavior for decoder output" into qt-dev am: cfb6f93443
...
am: ba0ce1d6a9
2019-06-21 12:56:36 -07:00
Lajos Molnar
46cb9bed22
Merge "media: clarify frame dropping behavior for decoder output" into qt-dev
...
am: cfb6f93443
2019-06-21 12:50:37 -07:00
