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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Xiaoyu Jin
|
1b4254be03
|
Merge "Log two new fields for initializeStats" into sc-dev
|
2021-06-09 19:36:50 +00:00 |
|
TreeHugger Robot
|
94e740e288
|
Merge "Remove tracing for notifyContentCapture" into sc-dev am: 789fe38968
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904360
Change-Id: I3a6607eaa1024612f4fb3ee3a3e258e445641fb5
|
2021-06-09 19:36:45 +00:00 |
|
TreeHugger Robot
|
b823b6bf91
|
Merge "Remove tracing for notifyContentCapture" into sc-dev am: 789fe38968 am: 49cfb97ac0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904360
Change-Id: Ic14e65880d30576f3cc682bbefe5406f6ed81116
|
2021-06-09 19:36:31 +00:00 |
|
Tej Singh
|
d4b7b0e3da
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: If7b65e095d15a9d260438bcb017f10ad3cae59d1
|
2021-06-09 19:36:07 +00:00 |
|
Treehugger Robot
|
28191ef620
|
[automerger skipped] Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" am: 388c76ada4 am: 74c6327514 -s ours am: f80cc92614 -s ours
am skip reason: Merged-In I551e0bee413432653f39c91664d716f695311b6f with SHA-1 46e5c0df76 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1729512
Change-Id: I77d4452baa1f22746637a50ecf0a962ba93bc946
|
2021-06-09 19:33:30 +00:00 |
|
Max Bires
|
764dab8181
|
[automerger skipped] Merge "Fixing the race condition in GenerateRkpKey" am: d1de4cc6e4 am: 2c455e5f1c -s ours am: 498fccac6e -s ours
am skip reason: Merged-In I917a61da612f21f9a0f783bea5d24270d4e1db42 with SHA-1 d05498b9d8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727159
Change-Id: Id2da6a361fc6bf2f5b908934b96823e13ced6fdd
|
2021-06-09 19:32:20 +00:00 |
|
TreeHugger Robot
|
49cfb97ac0
|
Merge "Remove tracing for notifyContentCapture" into sc-dev am: 789fe38968
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904360
Change-Id: Ide3b5000b8dd695adda3ef84271de5cc11b713ab
|
2021-06-09 19:30:27 +00:00 |
|
Tej Singh
|
4ad8ef142c
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: I47c024483e5996e9268f6926b76f4282169907ec
|
2021-06-09 19:24:13 +00:00 |
|
TreeHugger Robot
|
789fe38968
|
Merge "Remove tracing for notifyContentCapture" into sc-dev
|
2021-06-09 19:14:05 +00:00 |
|
Steve Elliott
|
9f3c726a9b
|
Merge "Add callbacks for bouncer keyguard reset" into sc-dev am: 33f8e11606 am: d190a4754e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920750
Change-Id: I87c94f8a17c9b17d41466dad7d8f6294d8a1f031
|
2021-06-09 19:07:27 +00:00 |
|
Matt Pietal
|
62117af355
|
Merge "Controls spacing" into sc-dev am: 68db245507 am: ea43bd1b28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919750
Change-Id: I263b08a17e8f869c205924eacc044e298740bb70
|
2021-06-09 19:05:46 +00:00 |
|
Ying Xu
|
a2b704abd5
|
Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev am: 0732d74669 am: fa85685345
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909852
Change-Id: I68be8629241bd2f567d128f96e5fb202e79d2521
|
2021-06-09 19:01:27 +00:00 |
|
Steve Elliott
|
d190a4754e
|
Merge "Add callbacks for bouncer keyguard reset" into sc-dev am: 33f8e11606
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920750
Change-Id: I36d97bebc12b4d3ecafc83f6117b6f6967d61682
|
2021-06-09 19:00:24 +00:00 |
|
Anna Zappone
|
f6c54b8429
|
Merge "Fix LTR & conversation updates on main thread" into sc-dev am: d8b5c05ff1 am: 23794f8632
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881553
Change-Id: I6174e4b96c6da513e30714080e8e8e25174d2dae
|
2021-06-09 19:00:16 +00:00 |
|
Mady Mellor
|
5641563740
|
Merge "Collapse the stack on clicks rather than on down" into sc-dev am: fd4a4a3ee5 am: 6de08c6165
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14850318
Change-Id: Iee01a487c03ecf8b264ca3c56f20ce48eee59f96
|
2021-06-09 18:56:13 +00:00 |
|
Treehugger Robot
|
f80cc92614
|
[automerger skipped] Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" am: 388c76ada4 am: 74c6327514 -s ours
am skip reason: Merged-In I551e0bee413432653f39c91664d716f695311b6f with SHA-1 46e5c0df76 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1729512
Change-Id: I033fa499701d117e1ed813294daa6539aa0280fa
|
2021-06-09 18:55:46 +00:00 |
|
Winson Chung
|
a4dcde66d1
|
Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev am: 24de1aa861 am: a9e03e665d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14912906
Change-Id: I1668df7c0c7d79108c3c1d4917afe6dfcbb08557
|
2021-06-09 18:55:44 +00:00 |
|
Max Bires
|
498fccac6e
|
[automerger skipped] Merge "Fixing the race condition in GenerateRkpKey" am: d1de4cc6e4 am: 2c455e5f1c -s ours
am skip reason: Merged-In I917a61da612f21f9a0f783bea5d24270d4e1db42 with SHA-1 d05498b9d8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727159
Change-Id: If0f5c72756f8126129c3f55f4fdae91e0fc1f492
|
2021-06-09 18:55:19 +00:00 |
|
Julia Reynolds
|
cf9657c75b
|
Merge "Update logic about parent and convo channels" into sc-dev am: b87598c3cc am: 8c497473a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14907947
Change-Id: If8f32648d59a51e87e419612d29addb5853d0b71
|
2021-06-09 18:54:22 +00:00 |
|
Matt Pietal
|
ea43bd1b28
|
Merge "Controls spacing" into sc-dev am: 68db245507
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919750
Change-Id: I166be025becc8d586832b74d06cf4f6e3d60f18c
|
2021-06-09 18:52:59 +00:00 |
|
Ying Xu
|
fa85685345
|
Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev am: 0732d74669
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909852
Change-Id: I15166502ad462afd8df3b520e0c0aa33013f7d22
|
2021-06-09 18:51:53 +00:00 |
|
Steve Elliott
|
1dc78f7899
|
Merge "Add callbacks for bouncer keyguard reset" into sc-dev am: 33f8e11606 am: e9db7ea04a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920750
Change-Id: Ie4bc40fa17daf4d61838455421d59357038e3514
|
2021-06-09 18:50:28 +00:00 |
|
Matt Pietal
|
329100dcca
|
Merge "Controls spacing" into sc-dev am: 68db245507 am: 20523cded1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919750
Change-Id: Ic59228c737d9cfc6327a9280b4524e79a099830e
|
2021-06-09 18:50:22 +00:00 |
|
Ying Xu
|
1fd4d934e7
|
Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev am: 0732d74669 am: 41700855f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909852
Change-Id: I66294f9b322be1331e1449db33b369756eb47853
|
2021-06-09 18:50:14 +00:00 |
|
Anna Zappone
|
49e37b0a81
|
Merge "Fix LTR & conversation updates on main thread" into sc-dev am: d8b5c05ff1 am: daca21595d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881553
Change-Id: Ia86ec95e96298e069909c35ad9af1a98345dec22
|
2021-06-09 18:50:04 +00:00 |
|
Mady Mellor
|
bed8ff2d09
|
Merge "Collapse the stack on clicks rather than on down" into sc-dev am: fd4a4a3ee5 am: abfba98a67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14850318
Change-Id: I598b1b445e9de98686f46e8741d130a74fab5032
|
2021-06-09 18:49:57 +00:00 |
|
Winson Chung
|
7332701c2a
|
Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev am: 24de1aa861 am: 65540bc717
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14912906
Change-Id: I75e178b782497441210851ba4d32f52d161531e1
|
2021-06-09 18:49:50 +00:00 |
|
Treehugger Robot
|
d36e17cf7d
|
[automerger skipped] Merge "Check for invalid device attestation parameters" am: 5d08573baa am: 9dc6ec07ad -s ours am: 03fb7d4e35 -s ours
am skip reason: Merged-In I4eeec8367ebdfad527395206ab9e89b409e02631 with SHA-1 c0133d7c47 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1730396
Change-Id: I1a1412b8a9f00e8e37e0214d404a61dc75302560
|
2021-06-09 18:49:45 +00:00 |
|
Julia Reynolds
|
a232e7b4dd
|
Merge "Update logic about parent and convo channels" into sc-dev am: b87598c3cc am: 78cea6e7e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14907947
Change-Id: Id922623d7035e52c96530d47c6905531edab37ea
|
2021-06-09 18:49:26 +00:00 |
|
Steve Elliott
|
e9db7ea04a
|
Merge "Add callbacks for bouncer keyguard reset" into sc-dev am: 33f8e11606
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920750
Change-Id: I052d46c16ff24d48991315dcc9563152b6507916
|
2021-06-09 18:46:43 +00:00 |
|
Matt Pietal
|
20523cded1
|
Merge "Controls spacing" into sc-dev am: 68db245507
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919750
Change-Id: Ia7b92cf9759fed0fd936449e15b34575705e66e4
|
2021-06-09 18:46:09 +00:00 |
|
Ying Xu
|
41700855f1
|
Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev am: 0732d74669
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909852
Change-Id: I83747a9353950a4546b7dada0f7d5259a82dc440
|
2021-06-09 18:44:44 +00:00 |
|
Tej Singh
|
e72a13d44c
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137
Change-Id: I0677d318752ff2be05afb28f8db04480413722d7
|
2021-06-09 18:42:55 +00:00 |
|
Steve Elliott
|
33f8e11606
|
Merge "Add callbacks for bouncer keyguard reset" into sc-dev
|
2021-06-09 18:26:41 +00:00 |
|
Treehugger Robot
|
74c6327514
|
Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" am: 388c76ada4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1729512
Change-Id: If29c56b48d3137e963884896888b35f6a44f0345
|
2021-06-09 18:20:34 +00:00 |
|
Matt Pietal
|
68db245507
|
Merge "Controls spacing" into sc-dev
|
2021-06-09 18:18:44 +00:00 |
|
Ying Xu
|
0732d74669
|
Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev
|
2021-06-09 18:13:15 +00:00 |
|
Max Bires
|
2c455e5f1c
|
Merge "Fixing the race condition in GenerateRkpKey" am: d1de4cc6e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727159
Change-Id: I65ba432d3e184f8112f5a6019cdada19a1976cc1
|
2021-06-09 18:09:37 +00:00 |
|
Anna Zappone
|
23794f8632
|
Merge "Fix LTR & conversation updates on main thread" into sc-dev am: d8b5c05ff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881553
Change-Id: I139d1a1e976f0acef06007442e1fc91f66dc97ba
|
2021-06-09 18:05:37 +00:00 |
|
Mady Mellor
|
6de08c6165
|
Merge "Collapse the stack on clicks rather than on down" into sc-dev am: fd4a4a3ee5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14850318
Change-Id: I5705a6db65605c7b3c7ecba0164aa7c959891cd3
|
2021-06-09 18:05:26 +00:00 |
|
Anna Zappone
|
daca21595d
|
Merge "Fix LTR & conversation updates on main thread" into sc-dev am: d8b5c05ff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881553
Change-Id: If64909446f15b58e47ff7f8735c996fdc916a1a7
|
2021-06-09 18:04:26 +00:00 |
|
Winson Chung
|
a9e03e665d
|
Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev am: 24de1aa861
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14912906
Change-Id: Id2dc2b634af4609b4b9b8f102ca4f17247c6f032
|
2021-06-09 18:04:25 +00:00 |
|