Lucas Dupin
|
e9c5c831d3
|
Merge "Revert zoom level" into sc-dev am: fe788b0b7b am: 7b9e7896e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921404
Change-Id: Iba4221b3e6249a616068b644cc595ab8450dff89
|
2021-06-09 20:57:39 +00:00 |
|
Xiaoyu Jin
|
78639b5084
|
Merge "Use AppSearchConfig in PlatformLogger" into sc-dev am: e298f682ca am: 2de7a96ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14709017
Change-Id: I21b5a1353b9bd1e61d3fe9b8220bd03c564e2040
|
2021-06-09 20:57:33 +00:00 |
|
Max Bires
|
043ca8086a
|
Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev am: 8092f01ce1 am: d6d9f9e044
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923499
Change-Id: I3bdcd8d62c26d067800bc0ca83b2fdef9256a0f5
|
2021-06-09 20:57:22 +00:00 |
|
Lucas Dupin
|
a842532ca4
|
Merge "Revert zoom level" into sc-dev am: fe788b0b7b am: bd6bfdac5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921404
Change-Id: I3c19341bc7e46a6a62fe8d1f02bbd78ba3ef211a
|
2021-06-09 20:53:14 +00:00 |
|
Xiaoyu Jin
|
1d7daf06c9
|
Merge "Use AppSearchConfig in PlatformLogger" into sc-dev am: e298f682ca am: 841b487089
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14709017
Change-Id: I8e13656c06994343ea1f555bb698238ace0c577b
|
2021-06-09 20:52:56 +00:00 |
|
Max Bires
|
ca8abb4e6c
|
Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev am: 8092f01ce1 am: 8c2eeaae0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923499
Change-Id: I15cbee9dfaa88a93908ce886bc9cbf779857f97b
|
2021-06-09 20:52:21 +00:00 |
|
Lucas Dupin
|
7b9e7896e4
|
Merge "Revert zoom level" into sc-dev am: fe788b0b7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921404
Change-Id: If7a4bdad09375da31bd293e4aa9dca07035e7c1d
|
2021-06-09 20:41:18 +00:00 |
|
Xiaoyu Jin
|
2de7a96ff8
|
Merge "Use AppSearchConfig in PlatformLogger" into sc-dev am: e298f682ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14709017
Change-Id: I6175267886bc9ba7f8754de00adf2a27bbed9b49
|
2021-06-09 20:40:28 +00:00 |
|
Max Bires
|
d6d9f9e044
|
Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev am: 8092f01ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923499
Change-Id: I1500cddd8be4def9b6080e8f6de0f4707a0e84da
|
2021-06-09 20:39:57 +00:00 |
|
Lucas Dupin
|
bd6bfdac5e
|
Merge "Revert zoom level" into sc-dev am: fe788b0b7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921404
Change-Id: Ie7b26966501ab49ad5fc0c535f22752ea67f6eab
|
2021-06-09 20:38:51 +00:00 |
|
Xiaoyu Jin
|
841b487089
|
Merge "Use AppSearchConfig in PlatformLogger" into sc-dev am: e298f682ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14709017
Change-Id: Ief964e44e21893c0dc259650384b04bc44e41956
|
2021-06-09 20:38:34 +00:00 |
|
Lucas Dupin
|
fe788b0b7b
|
Merge "Revert zoom level" into sc-dev
|
2021-06-09 20:38:17 +00:00 |
|
Max Bires
|
8c2eeaae0a
|
Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev am: 8092f01ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923499
Change-Id: I07ed945f0cf041f3178540945b53a4e247fc5957
|
2021-06-09 20:38:15 +00:00 |
|
Xiaoyu Jin
|
e298f682ca
|
Merge "Use AppSearchConfig in PlatformLogger" into sc-dev
|
2021-06-09 20:26:47 +00:00 |
|
Andy Hung
|
0aab289206
|
Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev am: aadafc7bf2 am: aac17bd155
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904524
Change-Id: Ie51f11f06b4fd64a724e2076d1e11d8779ae5d54
|
2021-06-09 20:22:51 +00:00 |
|
TreeHugger Robot
|
da29069615
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours am: 648b6b5dd4 -s ours am: bf424a02fa -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: Ifaa76a23663e0a0a7387beb1e7daefc021672808
|
2021-06-09 20:22:39 +00:00 |
|
Automerger Merge Worker
|
27e33ebaf4
|
Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours" into sc-dev am: ac1f0eb45a am: 9005aeb548 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: I556931b66a20d836f4f2dbfdaba3535a38005686
|
2021-06-09 20:22:31 +00:00 |
|
Tej Singh
|
273480cbd0
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours am: 61932ba12b am: c5e9318cf1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: Ib64e0611449a1fd19cc5ab9b26eade6f12c29634
|
2021-06-09 20:22:25 +00:00 |
|
TreeHugger Robot
|
b19991e3c7
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours am: e5c71c6990 -s ours am: 2b223ca7ff -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: Iebf35af9eb6cf7d49eb8f9fa9dcc041a127b38a8
|
2021-06-09 20:22:14 +00:00 |
|
Tej Singh
|
d701b7bdaa
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: d4b7b0e3da -s ours am: 3f2ba9c995 am: fed78c8fa4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: If1df75a1253a3554964ca20857c0e61b865d38be
|
2021-06-09 20:21:48 +00:00 |
|
Max Bires
|
8092f01ce1
|
Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev
|
2021-06-09 20:21:15 +00:00 |
|
Andy Hung
|
e47e95f82e
|
Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev am: aadafc7bf2 am: 21e0f4137a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904524
Change-Id: Ic754a9d91bfd9d406b0bd07fd028e658bd6b53b6
|
2021-06-09 20:05:28 +00:00 |
|
TreeHugger Robot
|
3a7aed17e5
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours am: 648b6b5dd4 -s ours am: 3ec5783f20 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: I43eb390e86169a4635d0bea8e2f84a0d8b91517d
|
2021-06-09 20:05:18 +00:00 |
|
Automerger Merge Worker
|
ca0c7bfa3d
|
Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours" into sc-dev am: ac1f0eb45a -s ours am: 92a042d66a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: I09e5542dcd9190141f1d2d64eee2d934d2d3698f
|
2021-06-09 20:05:11 +00:00 |
|
Andy Hung
|
aac17bd155
|
Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev am: aadafc7bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904524
Change-Id: I1d62b83345eff4f838c3503132a2d87a1730215d
|
2021-06-09 20:04:31 +00:00 |
|
TreeHugger Robot
|
952c57c913
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours am: e5c71c6990 -s ours am: 0be9333849 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: Ie252bfe60ad4b5a47994282f48cf2b8c9c16336c
|
2021-06-09 20:04:26 +00:00 |
|
TreeHugger Robot
|
bf424a02fa
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours am: 648b6b5dd4 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: Ia264dda2d6625b2d272aa8563f84d784e50290f8
|
2021-06-09 20:04:21 +00:00 |
|
Tej Singh
|
bfbf285c15
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: d4b7b0e3da -s ours am: 3f2ba9c995 -s ours am: 6fc08bbefd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: Ia46d28b9277dbce4dcee9c07b700dbc8124d71c6
|
2021-06-09 20:04:16 +00:00 |
|
Automerger Merge Worker
|
9005aeb548
|
Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours" into sc-dev am: ac1f0eb45a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: Id002aa3f0b8642565e0a5bcf47046802606a4aa9
|
2021-06-09 20:04:13 +00:00 |
|
Tej Singh
|
c5e9318cf1
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours am: 61932ba12b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: I13503c432b3312c151dd6b6f6b7cc7a4fc2a3b69
|
2021-06-09 20:04:10 +00:00 |
|
Xiaoyu Jin
|
cab181cb37
|
Merge "Log two new fields for initializeStats" into sc-dev am: 1b4254be03 am: 138dc1ea4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904666
Change-Id: Ic143b5880c08b3d12c73dfe593203689a7fc2790
|
2021-06-09 20:04:03 +00:00 |
|
TreeHugger Robot
|
2b223ca7ff
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours am: e5c71c6990 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: I2ac45b3f7f83336ffff535b56781b118ca97e1c8
|
2021-06-09 20:03:37 +00:00 |
|
Tej Singh
|
fed78c8fa4
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: d4b7b0e3da -s ours am: 3f2ba9c995
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: Idaee0f13ee925f2be46edb5b72e516181fe8a3f6
|
2021-06-09 20:03:15 +00:00 |
|
Andy Hung
|
21e0f4137a
|
Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev am: aadafc7bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904524
Change-Id: Iab4b7b45f08add806e3d082476f835dfdebc20cf
|
2021-06-09 19:59:01 +00:00 |
|
Max Bires
|
56318a568f
|
Revert "Fixing the race condition in GenerateRkpKey"
This reverts commit d05498b9d8.
Reason for revert: Bugged on non-RKP systems.
Bug: 190222116
Change-Id: Ie7d17d4251c381c1bae6a76cd9b0246c551f8042
|
2021-06-09 19:54:48 +00:00 |
|
Andy Hung
|
aadafc7bf2
|
Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev
|
2021-06-09 19:54:16 +00:00 |
|
TreeHugger Robot
|
3ec5783f20
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours am: 648b6b5dd4 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: I6811a045f3c856c27e305b0a8f9c0c5f43a1e7e6
|
2021-06-09 19:52:28 +00:00 |
|
Xiaoyu Jin
|
69900308e5
|
Merge "Log two new fields for initializeStats" into sc-dev am: 1b4254be03 am: deaa791916
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904666
Change-Id: Ia26cbd40e14b7a1cf601efad04e67a402117d211
|
2021-06-09 19:52:28 +00:00 |
|
Automerger Merge Worker
|
92a042d66a
|
Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours" into sc-dev am: ac1f0eb45a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: I880859b47f54a934d73ce4987208fe3f8d5ec10c
|
2021-06-09 19:52:24 +00:00 |
|
TreeHugger Robot
|
66729ddd60
|
Merge "Remove tracing for notifyContentCapture" into sc-dev am: 789fe38968 am: 94e740e288
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904360
Change-Id: I4f968afe437bf2f1b7acf9f72da18fa1ad89437e
|
2021-06-09 19:52:21 +00:00 |
|
TreeHugger Robot
|
0be9333849
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours am: e5c71c6990 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: I874caef974f281ce6f0799aaeb31c2a0cda9c6fc
|
2021-06-09 19:52:19 +00:00 |
|
Tej Singh
|
6fc08bbefd
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: d4b7b0e3da -s ours am: 3f2ba9c995 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: Icf655ea9bb14cf96c13fb2084131ed1ddce42ee6
|
2021-06-09 19:52:12 +00:00 |
|
Xiaoyu Jin
|
138dc1ea4f
|
Merge "Log two new fields for initializeStats" into sc-dev am: 1b4254be03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904666
Change-Id: I1d66ce7f0ae6b1436bd22abe23909be849908c44
|
2021-06-09 19:52:05 +00:00 |
|
TreeHugger Robot
|
648b6b5dd4
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: Iaf1a4699a19e745ed1a21d593fc0464b9deee56c
|
2021-06-09 19:51:27 +00:00 |
|
Automerger Merge Worker
|
ac1f0eb45a
|
Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours" into sc-dev
|
2021-06-09 19:51:25 +00:00 |
|
Tej Singh
|
61932ba12b
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: I698aa7200effbd9a9e6d3c3d93a159bc2f3c8b27
|
2021-06-09 19:51:15 +00:00 |
|
TreeHugger Robot
|
e5c71c6990
|
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: I09559db4221b80dc2fa564183c38765ad7f27f13
|
2021-06-09 19:51:15 +00:00 |
|
Tej Singh
|
3f2ba9c995
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: d4b7b0e3da -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: I8dc1552834b198177adea7242929a7b07fda1c9f
|
2021-06-09 19:50:49 +00:00 |
|
Xiaoyu Jin
|
deaa791916
|
Merge "Log two new fields for initializeStats" into sc-dev am: 1b4254be03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904666
Change-Id: I9539bc350f738dea9ffef0b8452add2494b6a4e5
|
2021-06-09 19:37:49 +00:00 |
|
TreeHugger Robot
|
548ddc79d3
|
Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: I868b0e88346f0674998770895a603e292cef4f9f
|
2021-06-09 19:37:36 +00:00 |
|