Commit Graph

647786 Commits

Author SHA1 Message Date
Mady Mellor
adeb2a4e08 Merge "Fix flaky/broken test" into sc-dev am: d92b19cead
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15149171

Change-Id: I7d9817b86786203ae85faee753835eb0cc19fed9
2021-06-30 16:48:25 +00:00
Mady Mellor
d92b19cead Merge "Fix flaky/broken test" into sc-dev 2021-06-30 16:44:41 +00:00
Tom Natan
6544dd4c08 Merge "Add support for setProperties in TestableDeviceConfig" into sc-v2-dev 2021-06-30 16:41:22 +00:00
Lucas Dupin
0730daf09c Merge "Draw ripple effect in a circle to reduce overdraw" into sc-dev am: 49ffc85c56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15139261

Change-Id: I74b353872973c43268421aeec587333ba58ffcf4
2021-06-30 16:39:39 +00:00
Lucas Dupin
49ffc85c56 Merge "Draw ripple effect in a circle to reduce overdraw" into sc-dev 2021-06-30 16:34:47 +00:00
Vadim Caen
f5c3ec4b9f Merge "Add support for the DeviceConfig exception list" into sc-dev am: 4ac1b0851d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920933

Change-Id: Ic68ab5e341e93d73c5147d9c669e1fcabf7c2b93
2021-06-30 16:29:42 +00:00
Issei Suzuki
8d7e1c5ec9 Merge "Remove stopped activity from UnknownAppVisibilityController." into sc-dev am: 33dfa7446f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114538

Change-Id: I497db48c20600b837d382afc8a7bd0d16d278550
2021-06-30 16:29:24 +00:00
Bernardo Rufino
eb2998459e [automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: 159542ac4f -s ours am: fe08620ac7 -s ours
am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 14c1c7b4a7 is already in history

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

Change-Id: I98c4af1ca595c1328b0854fa0ff7ed02b85d757a
2021-06-30 16:29:17 +00:00
John Reck
e6a34680ec Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2 am: 2e440eb0a8 am: 92ed82502c am: 454c79f710 am: 9ed0a05460 am: babf7fabc3 am: f1d8c72d2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: Ie7227b340c991be3d8dba3000be87933feed7944
2021-06-30 16:29:07 +00:00
Dmitry Dementyev
b0910a25a3 Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 am: c9fdb5f38e am: 1d8503c538 am: 44c434d747 am: a1df427adb am: ebb7d92994 am: 2818394b07
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: I9fa64d45d37c9d0953b6228154f7961a9fef7f0a
2021-06-30 16:28:51 +00:00
John Reck
408368f25f Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b am: 6a154c0cb5 am: 4c548ab470 am: 6416281478 am: 1b692301be am: 92bb88ab7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880619

Change-Id: Id8f2ca19d294ecce4a1d8fd1c6ae57b18ca0adb9
2021-06-30 16:28:39 +00:00
TreeHugger Robot
984f061e2e [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev am: 075e4bbbb2 -s ours am: cbe9be1eec -s ours am: 7253e1ee9f -s ours am: da74491fd9 -s ours am: ccc41f4457 -s ours am: 21b7dae4c4 -s ours am: 544f54cd29 -s ours
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 49be6ee46a is already in history

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

Change-Id: I624185dee95a05f4542087bb94793f1c19eba724
2021-06-30 16:28:22 +00:00
Bernardo Rufino
7926027ebf [automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: ccdf929a26 -s ours am: c9c77fdd22 -s ours
am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 5fbeff59df is already in history

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

Change-Id: If28f7027bc7e163df4571fe98fa2bdfa1a95271e
2021-06-30 16:28:07 +00:00
John Reck
0a37b6aa11 Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2 am: 2e440eb0a8 am: 92ed82502c am: 454c79f710 am: 9ed0a05460 am: 06254a7b88 am: 4c7ddfbef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: I8028a562a8f798ce0af4c9948578a102595e49b0
2021-06-30 16:27:49 +00:00
Automerger Merge Worker
a342dd088a Merge "Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 am: c9fdb5f38e am: 1d8503c538 am: 44c434d747 am: a1df427adb am: 5a96905df4" into sc-dev am: d9e6c1ee7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: If14529f08b3905ccdea490714e304299b4217808
2021-06-30 16:27:33 +00:00
Automerger Merge Worker
6d738a20af Merge "[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865c9 -s ours am: f5dd6374a3 -s ours am: 155c60cda4 -s ours am: b082d71715 -s ours am: 7fe8133985 -s ours" into sc-dev am: c048559ef2 -s ours
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 f7f339c7d0 is already in history

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

Change-Id: I9cce265552a77214880e563bb7d94d434d627c06
2021-06-30 16:26:26 +00:00
Automerger Merge Worker
7cb858cea0 Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b am: 6a154c0cb5 am: 4c548ab470 am: 6416281478 am: af4fa84b24" into sc-dev am: e01f6558b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880619

Change-Id: I6984d592317cc58b05dca1e64a182df645d8dece
2021-06-30 16:25:53 +00:00
Vadim Caen
4ac1b0851d Merge "Add support for the DeviceConfig exception list" into sc-dev 2021-06-30 16:25:22 +00:00
Issei Suzuki
33dfa7446f Merge "Remove stopped activity from UnknownAppVisibilityController." into sc-dev 2021-06-30 16:24:37 +00:00
Automerger Merge Worker
605876dfa2 Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be1e am: 419bd64bc4 am: 6b905ded5f am: 159bc53cf0" into sc-dev am: 227a964660
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880618

Change-Id: I391328a34e6076ab27ca1b9011908b9f1e6d6a32
2021-06-30 16:24:21 +00:00
Bernardo Rufino
fe08620ac7 [automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: 159542ac4f -s ours
am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 14c1c7b4a7 is already in history

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

Change-Id: Id99a654dd27b6c7a5e4d32ae20842439a6c407c1
2021-06-30 16:23:55 +00:00
TreeHugger Robot
7e5434da08 [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev am: 075e4bbbb2 -s ours am: cbe9be1eec -s ours am: 7253e1ee9f -s ours am: da74491fd9 -s ours am: ccc41f4457 -s ours am: a3374f6d95 -s ours am: b5247c1167 -s ours
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 49be6ee46a is already in history

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

Change-Id: Ic22b70af80106516a604d4b4ce538bdbf56988db
2021-06-30 16:23:54 +00:00
Automerger Merge Worker
23d25f4fda Merge "[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into qt-dev am: 976266733d -s ours am: f39c26871b -s ours am: 5352a08ac7 -s ours am: 5a6ceba057 -s ours" into sc-dev am: c508a3cd9a -s ours
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 f7f339c7d0 is already in history

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

Change-Id: Ib0ef03b887a159eb45c114ffbdf72b9731201ff4
2021-06-30 16:23:45 +00:00
John Reck
f1d8c72d2e Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2 am: 2e440eb0a8 am: 92ed82502c am: 454c79f710 am: 9ed0a05460 am: babf7fabc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: I942550800d1c46d12f3799f2e9d2f3f23da1ea89
2021-06-30 16:23:24 +00:00
TreeHugger Robot
981dbc51dc [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865c9 -s ours am: f5dd6374a3 -s ours am: 155c60cda4 -s ours am: b082d71715 -s ours am: 7fbcb9b945 -s ours am: 7fdc126fdd -s ours
am skip reason: skipped by user steell

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

Change-Id: Ic5b55697d620bd59602e26f2261a58932752e7a5
2021-06-30 16:23:10 +00:00
John Reck
73ac2ec27b Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be1e am: 419bd64bc4 am: 6b905ded5f am: c13511c434 am: 3a190e00ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880618

Change-Id: I7d60f5782a7574322ca2fcf60c039eee1ddf979a
2021-06-30 16:23:02 +00:00
Dmitry Dementyev
2818394b07 Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 am: c9fdb5f38e am: 1d8503c538 am: 44c434d747 am: a1df427adb am: ebb7d92994
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: Ie9ebd4def93a2c78129b342645184e4b0b93b359
2021-06-30 16:22:47 +00:00
TreeHugger Robot
902fdb48c9 [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into qt-dev am: 976266733d -s ours am: f39c26871b -s ours am: 5352a08ac7 -s ours am: 2603b550d8 -s ours am: 3b8d003579 -s ours
am skip reason: skipped by user steell

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

Change-Id: I5d7c0d2cbb26e8e5c3e2fd93fed08270221ede9c
2021-06-30 16:22:45 +00:00
John Reck
92bb88ab7e Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b am: 6a154c0cb5 am: 4c548ab470 am: 6416281478 am: 1b692301be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880619

Change-Id: I9b86456ee858390dee55ad6959dfeb0c7300a514
2021-06-30 16:22:12 +00:00
TreeHugger Robot
544f54cd29 [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev am: 075e4bbbb2 -s ours am: cbe9be1eec -s ours am: 7253e1ee9f -s ours am: da74491fd9 -s ours am: ccc41f4457 -s ours am: 21b7dae4c4 -s ours
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 49be6ee46a is already in history

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

Change-Id: Ia21a24d3070f6ec8c812700471cc9ee486aebc31
2021-06-30 16:21:45 +00:00
Bernardo Rufino
c9c77fdd22 [automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: ccdf929a26 -s ours
am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 5fbeff59df is already in history

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

Change-Id: I3e27d71a9a35b6439b15f6a238f6e1db0f6984f6
2021-06-30 16:21:17 +00:00
John Reck
4c7ddfbef4 Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2 am: 2e440eb0a8 am: 92ed82502c am: 454c79f710 am: 9ed0a05460 am: 06254a7b88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: Id6ffb44f03ebc237525333b57ca9c251a6b9b256
2021-06-30 16:20:52 +00:00
Automerger Merge Worker
d9e6c1ee7e Merge "Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 am: c9fdb5f38e am: 1d8503c538 am: 44c434d747 am: a1df427adb am: 5a96905df4" into sc-dev 2021-06-30 16:20:40 +00:00
Automerger Merge Worker
c048559ef2 Merge "[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865c9 -s ours am: f5dd6374a3 -s ours am: 155c60cda4 -s ours am: b082d71715 -s ours am: 7fe8133985 -s ours" into sc-dev 2021-06-30 16:20:19 +00:00
Dmitry Dementyev
cd97b29474 Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 am: c9fdb5f38e am: 1d8503c538 am: 44c434d747 am: a1df427adb am: 5a96905df4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: I4f8222c0ebac5f08c6d812945978d47f1528c809
2021-06-30 16:20:18 +00:00
Automerger Merge Worker
e01f6558b4 Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b am: 6a154c0cb5 am: 4c548ab470 am: 6416281478 am: af4fa84b24" into sc-dev 2021-06-30 16:20:07 +00:00
TreeHugger Robot
8a0017fc4c [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865c9 -s ours am: f5dd6374a3 -s ours am: 155c60cda4 -s ours am: b082d71715 -s ours am: 7fe8133985 -s ours
am skip reason: skipped by user steell

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

Change-Id: I15c5546b30febf5954c99d90c3ebbcfa5c45f8b7
2021-06-30 16:20:02 +00:00
Automerger Merge Worker
227a964660 Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be1e am: 419bd64bc4 am: 6b905ded5f am: 159bc53cf0" into sc-dev 2021-06-30 16:19:52 +00:00
John Reck
ae1bf727ea Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b am: 6a154c0cb5 am: 4c548ab470 am: 6416281478 am: af4fa84b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880619

Change-Id: I424011589b4f9face3b816cd062a88e292a32cae
2021-06-30 16:19:43 +00:00
John Reck
9a583e1b00 Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be1e am: 419bd64bc4 am: 6b905ded5f am: 159bc53cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880618

Change-Id: I7489ab210e99e9dffcbba8c41f1da89c8f448c09
2021-06-30 16:19:19 +00:00
TreeHugger Robot
b5247c1167 [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev am: 075e4bbbb2 -s ours am: cbe9be1eec -s ours am: 7253e1ee9f -s ours am: da74491fd9 -s ours am: ccc41f4457 -s ours am: a3374f6d95 -s ours
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 49be6ee46a is already in history

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

Change-Id: If27d362767400b2d12b339f0f538d9496b761b39
2021-06-30 16:19:15 +00:00
Automerger Merge Worker
c508a3cd9a Merge "[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into qt-dev am: 976266733d -s ours am: f39c26871b -s ours am: 5352a08ac7 -s ours am: 5a6ceba057 -s ours" into sc-dev 2021-06-30 16:19:07 +00:00
TreeHugger Robot
7fdc126fdd [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865c9 -s ours am: f5dd6374a3 -s ours am: 155c60cda4 -s ours am: b082d71715 -s ours am: 7fbcb9b945 -s ours
am skip reason: skipped by user steell

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

Change-Id: I5233a620cb45b7c24d8eb8f026d26f524f372899
2021-06-30 16:18:50 +00:00
TreeHugger Robot
db4ba1b216 [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into qt-dev am: 976266733d -s ours am: f39c26871b -s ours am: 5352a08ac7 -s ours am: 5a6ceba057 -s ours
am skip reason: skipped by user steell

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

Change-Id: I37b480f09f17e8bb4bf6e51a4850b6254860610f
2021-06-30 16:18:33 +00:00
John Reck
3a190e00ae Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be1e am: 419bd64bc4 am: 6b905ded5f am: c13511c434
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880618

Change-Id: I0e0a29a3bc5b19c3728ee58f0600c6f7cbf1c7a7
2021-06-30 16:18:30 +00:00
TreeHugger Robot
3b8d003579 [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into qt-dev am: 976266733d -s ours am: f39c26871b -s ours am: 5352a08ac7 -s ours am: 2603b550d8 -s ours
am skip reason: skipped by user steell

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

Change-Id: I0e0062c45970f9a00660afe4f927b9ddab8019a9
2021-06-30 16:18:09 +00:00
TreeHugger Robot
3b1639f8a3 Merge "Update documentation outlining results during voice calls." into sc-dev am: c2a780dbd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15128665

Change-Id: I7505939765835faa0948712d777ea89a8455bbe9
2021-06-30 16:12:55 +00:00
Pierre Barbier de Reuille
bb90d61780 Merge "Add a config value for the default of the analog clock flag" into sc-dev am: 8ea2a96c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15001970

Change-Id: Ib3741e272583a0985ce186299d89074381bb43a1
2021-06-30 16:12:45 +00:00
TreeHugger Robot
c2a780dbd6 Merge "Update documentation outlining results during voice calls." into sc-dev 2021-06-30 16:11:27 +00:00
Pierre Barbier de Reuille
8ea2a96c28 Merge "Add a config value for the default of the analog clock flag" into sc-dev 2021-06-30 16:09:15 +00:00