Commit Graph

771873 Commits

Author SHA1 Message Date
Julia Reynolds
d2ccdde02a [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours am: 7b0e35612b -s ours am: e2b9b0e7f6 -s ours am: a0f2256785 -s ours am: 13346fa806 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I9dee9b7ea8ae75d5158351ae83da5509844156c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:12:34 +00:00
TreeHugger Robot
42a24da0fa [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours am: a758eac912 -s ours am: 17389c0e03 -s ours am: f2d438e8d5 -s ours am: 83540503d1 -s ours am: 466b93cfc4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I3eb27c246f53128b7226bd45742b03a840806a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:12:01 +00:00
Julia Reynolds
3a1694e38d [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours am: 7b0e35612b -s ours am: e2b9b0e7f6 -s ours am: a0f2256785 -s ours am: 2bc402f373 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: Iff595cb4f8b18f1269dda953dbdefefcc9c43cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:11:59 +00:00
TreeHugger Robot
466b93cfc4 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours am: a758eac912 -s ours am: 17389c0e03 -s ours am: f2d438e8d5 -s ours am: 83540503d1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: Id92efbfe966b60ad21022ae3bfffb4701dd20132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 01:31:43 +00:00
Julia Reynolds
13346fa806 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours am: 7b0e35612b -s ours am: e2b9b0e7f6 -s ours am: a0f2256785 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: Ifbd659b41eb163f58e4d2a432ca05d3bd076dd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 01:31:38 +00:00
Julia Reynolds
2bc402f373 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours am: 7b0e35612b -s ours am: e2b9b0e7f6 -s ours am: a0f2256785 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: Ic160f2a50ebdb5c477f7ab36ced9e3ae883460f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 01:31:36 +00:00
TreeHugger Robot
83540503d1 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours am: a758eac912 -s ours am: 17389c0e03 -s ours am: f2d438e8d5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I3eca05617a7c2ae38477143dfa159ca79b19d086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:27:40 +00:00
Julia Reynolds
a0f2256785 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours am: 7b0e35612b -s ours am: e2b9b0e7f6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I4915e219c750d7f3890eb906a7bc24ca0a54614a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:27:39 +00:00
Shan Huang
08cf1825ed Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am: bd7ac0c646 am: 19220d853a am: 2c0e67d956
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310689

Change-Id: I7bb1e55113993541f4012953e8a470e9d8b6292e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:05:26 +00:00
James O'Leary
98d9c107df Merge changes from topic "colorSchemeChanges" into tm-dev am: e320ce441d am: b185ee027b am: 728b21dbcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164075

Change-Id: Iea54205b67879912e4a2e5158164fbdf3ac362bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:04:27 +00:00
TreeHugger Robot
f1aeb07dca Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c am: f046fedfe7 am: d48bed85ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350522

Change-Id: I175bd58a9725b1005a07e324733a2a0e44e02b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:04:06 +00:00
Alex Buynytskyy
c20451d27a Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a am: 30375852fb am: 816ed26c89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18339383

Change-Id: I83f8dac8cf865a9bb52c7d3ae487e4c4b8d2e7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:03:53 +00:00
Winson Chiu
07c5ed4a7a Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a78 am: 79d42a23bc am: e96ad2ad36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351504

Change-Id: Ibbfb61f008b887bd80241f69b120df43d3ea2a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:03:37 +00:00
Miranda Kephart
9946909c87 Merge "Ignore repeated dismissals for clipboard" into tm-dev am: 3ffed0bca8 am: bc0edaae72 am: 3b3d2597ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349555

Change-Id: I160a3c43ec99ecaf4498e062e70a58e61ba52586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:03:22 +00:00
Jing Ji
5f1a4164ad Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev am: 317e43a1ff am: 66abf4d225 am: bfa926cf1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331909

Change-Id: Iba90a5860598bf6b5d5924446d6ce57314eec08d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:03:07 +00:00
TreeHugger Robot
b399239bde Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96 am: 2bdaacec70 am: 7c38017d3f am: bb41c14a8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I73ec2f70ae52ed2203f1a5d111133d4ee548fab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:02:53 +00:00
Automerger Merge Worker
95a0aaee9d Merge "Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am: bd7ac0c646 am: a4144a6930" into tm-d1-dev-plus-aosp am: 40e4bf09a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310689

Change-Id: I13bc2e32018553547a10c459ac5d1249cd35b6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:02:37 +00:00
TreeHugger Robot
50eb6515b1 Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec am: 3953a6a498 am: 44ffcf545b am: 5c623433d2 am: 5eeb26cb32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I3808b6ddeeddcf84744469b543f5bbc71876309c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:02:14 +00:00
Shan Huang
74057e341d Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am: bd7ac0c646 am: 19220d853a am: ad8e47338c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310689

Change-Id: I46806780822d503e7ed439b82756e1f2a994f8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:01:55 +00:00
James O'Leary
c5357af888 Merge changes from topic "colorSchemeChanges" into tm-dev am: e320ce441d am: 61751f90b9 am: c3a9ace100
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164075

Change-Id: I4d0b5646b400cb3ef4c9051b2bbb40e72817aa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:01:13 +00:00
TreeHugger Robot
e9c729ed83 [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours am: a2c2b98770 -s ours am: d6dffa9fed -s ours am: b062ef504b -s ours am: d0d0ec576a -s ours
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18347927

Change-Id: I8d3df8b279798c770ff70df33a95ebd871697776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:00:26 +00:00
Automerger Merge Worker
83f9ac2d7f Merge "Merge "Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea6261 am: 894dbdf988" into tm-d1-dev-plus-aosp am: 09878987f5" into tm-qpr-dev-plus-aosp 2022-05-13 00:00:21 +00:00
Automerger Merge Worker
080e43d978 Merge "Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea6261 am: 894dbdf988" into tm-d1-dev-plus-aosp am: 09878987f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309447

Change-Id: I3cd31c6d565400670cdfcf3316857239a63ef25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:00:16 +00:00
James O'Leary
9eba38a03d Merge changes from topic "colorSchemeChanges" into tm-dev am: e320ce441d am: b185ee027b am: 56d3315b3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164075

Change-Id: Ifebcdbf81b3f5961a12d4e3ff581012a6309c694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:00:12 +00:00
Automerger Merge Worker
74fa2f64bb Merge "Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c am: f046fedfe7 am: c4fb8dfbaf" into tm-qpr-dev-plus-aosp 2022-05-13 00:00:01 +00:00
TreeHugger Robot
eb7213d6c6 Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c am: e8ac2e1436 am: c651cf0db8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350522

Change-Id: I4f47c4be269468ab02cec4d70ac1a6467d65cc0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:59:55 +00:00
TreeHugger Robot
fb881dab12 Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c am: f046fedfe7 am: c4fb8dfbaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350522

Change-Id: If7fff0db0261887b4450e986d72ce0fcd39c6808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:59:55 +00:00
Alex Buynytskyy
fac82e6ffe Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a am: 30375852fb am: ce9f7cdffc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18339383

Change-Id: I8c98ef713fcf160a9743ef5b45c80ecb6957f5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:59:42 +00:00
Winson Chiu
efdd9da408 Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a78 am: 79d42a23bc am: 6089059070
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351504

Change-Id: I5c8745ff109213d05f2cfb0a04396fce2fcbe9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:59:30 +00:00
Miranda Kephart
a8a03b7c6b Merge "Ignore repeated dismissals for clipboard" into tm-dev am: 3ffed0bca8 am: bc0edaae72 am: b9cd7810fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349555

Change-Id: Id0bd31a3c99afe5c93885bebbed884c09fd78269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:59:17 +00:00
Jing Ji
4ee4072cc8 Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev am: 317e43a1ff am: 66abf4d225 am: 4f92fb5e95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331909

Change-Id: I3d72c1f8bb848f0ef27188cc8cc0727190692b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:59:05 +00:00
TreeHugger Robot
3d832b9a6a Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96 am: 2bdaacec70 am: 7c38017d3f am: 464521f08d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I9b052e734bb402f7357a55f3154ad030dba2c153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:58:52 +00:00
TreeHugger Robot
8c6d26206e Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec am: 3953a6a498 am: 44ffcf545b am: 5c623433d2 am: b37ca424a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: Idc13370db5da6377a425867b716bed3e9df04d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:58:35 +00:00
TreeHugger Robot
8f993ade87 [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours am: a2c2b98770 -s ours am: d6dffa9fed -s ours am: b062ef504b -s ours am: 464714e913 -s ours
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18347927

Change-Id: Ib438c9abb1ec4643f88aa19d80d991240e446514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:58:17 +00:00
Shaowei Shen
f60fa86852 Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea6261 am: 894dbdf988 am: b50bf849c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309447

Change-Id: Ia28ca20783afebfc095169c3b2fee96a6e373509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:58:07 +00:00
TreeHugger Robot
f2d438e8d5 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours am: a758eac912 -s ours am: 17389c0e03 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I40a126532ed6ade3d879a09604c0f311212cfd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:57:45 +00:00
Julia Reynolds
e2b9b0e7f6 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours am: 7b0e35612b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I87513e0105b32a84569c7e219c4288e10ef0d804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:57:28 +00:00
Shan Huang
ad8e47338c Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am: bd7ac0c646 am: 19220d853a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310689

Change-Id: I81f376c57805da0a4412bba8c852b607dc5cf04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:34:11 +00:00
Shan Huang
2c0e67d956 Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am: bd7ac0c646 am: 19220d853a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310689

Change-Id: I4784e5d427c9e542174e7cb2ed61ad12b1807e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:34:09 +00:00
James O'Leary
728b21dbcf Merge changes from topic "colorSchemeChanges" into tm-dev am: e320ce441d am: b185ee027b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164075

Change-Id: If39dfe94f2d45659c0dc6c6e6e10ecf030040d41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:33:58 +00:00
TreeHugger Robot
d48bed85ba Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c am: f046fedfe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350522

Change-Id: I5cfb86e8dcb9163c9491d75931edad26ab3986ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:33:38 +00:00
Alex Buynytskyy
816ed26c89 Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a am: 30375852fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18339383

Change-Id: If643bc5c7a65c58faa194109d3b027b13abd3f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:33:19 +00:00
Winson Chiu
e96ad2ad36 Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a78 am: 79d42a23bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351504

Change-Id: I229eb101129ecff6cd6e1597efd65037f8f4921f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:33:01 +00:00
James O'Leary
56d3315b3c Merge changes from topic "colorSchemeChanges" into tm-dev am: e320ce441d am: b185ee027b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164075

Change-Id: Ied6d7761a1257a6e42b86701235c9bcca7a25324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:32:56 +00:00
TreeHugger Robot
c4fb8dfbaf Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c am: f046fedfe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350522

Change-Id: I56c826ede2831a2ce2986d899fe58d002146cd99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:32:44 +00:00
Miranda Kephart
3b3d2597ed Merge "Ignore repeated dismissals for clipboard" into tm-dev am: 3ffed0bca8 am: bc0edaae72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349555

Change-Id: Ie965f470d4cea0441b5527fba93837335efa4842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:32:40 +00:00
Alex Buynytskyy
ce9f7cdffc Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a am: 30375852fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18339383

Change-Id: I6f45f1e82d4f5cccaa89f980f4cdf4f8ca664d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:32:28 +00:00
Jing Ji
bfa926cf1c Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev am: 317e43a1ff am: 66abf4d225
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331909

Change-Id: I28aaed1a2ec94d6157d8fad3180d93e27652a9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:32:20 +00:00
Winson Chiu
6089059070 Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a78 am: 79d42a23bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351504

Change-Id: Ie870219c5b3514c363fc5d79f1b5a0cfecdd6fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:32:09 +00:00
TreeHugger Robot
bb41c14a8b Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96 am: 2bdaacec70 am: 7c38017d3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I3412b1e43121098e4aa38e37a2558ddf9054cd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:32:03 +00:00