Commit Graph

771594 Commits

Author SHA1 Message Date
Automerger Merge Worker
9c80ab5d76 Merge "Merge "Add and update some hotword detection metrics" into tm-dev am: 5e1904c323 am: e9412cf6cd am: e093f8d940" 2022-04-13 11:34:27 +00:00
TreeHugger Robot
61daf00a4b Merge "Add and update some hotword detection metrics" into tm-dev am: 5e1904c323 am: e9412cf6cd am: e093f8d940
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17701596

Change-Id: I05c274ce9be87d16ff3be0bacdf057adc8c957d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:34:03 +00:00
Automerger Merge Worker
031e70f266 Merge "Merge "Cache OverContext to prevent deadlock" into tm-dev am: 801e5c0dd4" into tm-mainline-prod am: 6d513cdb61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17499147

Change-Id: I5269cc2a55400528cc05438fe9ea1eec69611f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:33:56 +00:00
Automerger Merge Worker
58c6bfbe8c Merge "Merge "Enable haptic for face coex" into tm-d1-dev am: 0032983c0b am: 709821a418" 2022-04-13 11:33:29 +00:00
TreeHugger Robot
7ab4079f3c Merge "Enable haptic for face coex" into tm-d1-dev am: 0032983c0b am: 709821a418
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716389

Change-Id: I2b4ff7eff0193c2a0c924c1ea13179e23e3a1c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:33:08 +00:00
Oli Lan
10bed37fcb Merge "Add logging of user stop and user removal events." into tm-dev am: 087964ad18 am: bd0fbf384a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17104659

Change-Id: Ia2b065aa05a4f05ce2e9ecff180cfd648bb53ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:32:56 +00:00
Automerger Merge Worker
17c34fa20f Merge "Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 am: 43567ad451 am: 00c2754219 am: 39eb41b554 am: 16a702d489 am: 2c9b4744de" 2022-04-13 11:32:12 +00:00
Keith Mok
e765ae9a44 Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 am: 43567ad451 am: 00c2754219 am: 39eb41b554 am: 16a702d489 am: 2c9b4744de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959779

Change-Id: I8b1413b6126a2f0db90d7ac5c8ca64be08d240e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:31:40 +00:00
TreeHugger Robot
db054a58b6 Merge "Only add system language on locale page" into tm-dev am: 66070d7c8a am: 6eebdb9f5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17739084

Change-Id: I137b65d2edac6fc58a37b162f12e0d6ff04f52d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:31:16 +00:00
Automerger Merge Worker
3c74fe1cd0 Merge "Merge "Fix OTT devices not reacting to messages in Standby" am: 4065fa6496 am: acc1ea43a5 am: 002a792474 am: 26d79e363e am: 597a9a911b" 2022-04-13 11:31:03 +00:00
Automerger Merge Worker
e91524f6aa Merge "Merge "Fix NPE in AppsFilter" into tm-dev am: 19412da261 am: 64a70c0e4f am: 984d9cbf6d" 2022-04-13 11:30:44 +00:00
Yan Han
a2e999544a Merge "Fix OTT devices not reacting to messages in Standby" am: 4065fa6496 am: acc1ea43a5 am: 002a792474 am: 26d79e363e am: 597a9a911b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055913

Change-Id: Ibab026499cfd3fc47f16bdf5ca645bed91cf5bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:30:31 +00:00
TreeHugger Robot
15e1a716d0 Merge "Fix NPE in AppsFilter" into tm-dev am: 19412da261 am: 64a70c0e4f am: 984d9cbf6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17668627

Change-Id: Ib62e6020593a284f5afeac10635aeb00617d9ce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:30:11 +00:00
Treehugger Robot
eee48bb003 Merge "Add extra logging" am: 47b98a2d38 am: 9479208dd3 am: 09d3410e51 am: 0ec82bc2b1 am: 2a2b27f877
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056510

Change-Id: I4448b67685c32be7aea2fe061bf7a447df6fdcab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:29:50 +00:00
Automerger Merge Worker
86ae9a9879 Merge "Merge "Promote WMJetpackUnitTests to presubmit" into tm-dev am: 64d4564747 am: cc580a03ef" 2022-04-13 11:29:34 +00:00
Charles Chen
3ec6deb3f0 Merge "Promote WMJetpackUnitTests to presubmit" into tm-dev am: 64d4564747 am: cc580a03ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17635304

Change-Id: I903c9f5d3e3d2dbf359144be0694665e89f35234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:29:07 +00:00
Automerger Merge Worker
dd3d65d85d Merge "Merge "frameworks/base - Tiramisu is now 33" into tm-dev am: 595ec5f75c am: df6003b64c am: d4a91bd488" 2022-04-13 11:29:06 +00:00
Yurii Zubrytskyi
021e08cb24 Merge "frameworks/base - Tiramisu is now 33" into tm-dev am: 595ec5f75c am: df6003b64c am: d4a91bd488
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699091

Change-Id: I024c16e7092c63f916c2422955f3c774f9c02d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:28:41 +00:00
TreeHugger Robot
3958b55afe Merge "Re-land "Move rounded corner to provider"" into tm-dev am: cee24a3d7a am: 1b344c6465
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630309

Change-Id: I82662ef7ce8522d97dd452bddb00d3720607f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:28:25 +00:00
David Drysdale
859cc65110 Merge "Clarify doc comment for setUnlockedDeviceRequired" am: a0976a1207 am: f6354a20d5 am: 9025d607a0 am: 90099ff85c am: 28d0652992
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2060058

Change-Id: I678ff3badcf5987f0baa8ef327bb36e786998ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:27:51 +00:00
Charles Chen
ad6f3710ad Merge changes from topic "presubmit-am-63dae37384ff42c4ad3ee8cab0e7dbc9" into tm-mainline-prod am: b2799663c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17635304

Change-Id: I43eff56471a90e2f61ea793fae683f045bdd4372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:27:08 +00:00
TreeHugger Robot
ea321f5161 Merge changes from topic "presubmit-am-9b5e750ffe3a4cb798418c89d9e7f523" into tm-mainline-prod am: 27e8c4c0cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630309

Change-Id: I73a9f66510b888429ed646084b7ce50b327309b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:26:18 +00:00
Kholoud Mohamed
13271c7d27 Merge "Move device management resource retrieval calls to bg thread" into tm-dev am: fb0a6a1950 am: 7f659181be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607256

Change-Id: I8d75a094565e899f43d51a113ff590887ac939e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:25:53 +00:00
TreeHugger Robot
1e26c2056a Merge "usb: Fixed the null pointer issue" into tm-dev am: eb1eb03859 am: b590788672
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665877

Change-Id: I5cb2b6f0e1a29e995c77a63b83c992e97628a5e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:25:14 +00:00
Kholoud Mohamed
a7f46c114a Merge changes from topic "presubmit-am-4a2696f4ddc84cf0bbb8f7ad2cec421d" into tm-mainline-prod am: c36db9e7ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607256

Change-Id: I716d2cdab537b72e6f7f8b1b32bc67b5ef69a76c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:23:33 +00:00
TreeHugger Robot
2d00d29bc5 Merge changes from topic "presubmit-am-a48f52096e034a1e945d85dd74e1d766" into tm-mainline-prod am: e12157d8b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665877

Change-Id: I530176c90425b923b2859bbf06f53705f54fd831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:22:50 +00:00
Lucas Lin
2122d53807 Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network" am: 6ccd0e0503 am: 46d9f02a15 am: a4c15d442d am: bae41b28d5 am: 669a09a10e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062247

Change-Id: I2cf07c207b41f30943c58abe57561d5884d101a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:22:08 +00:00
TreeHugger Robot
d04c2870ec Merge "Apply transaction when starting back nav" into tm-dev am: 9e9a9d36ac am: e43203b543
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570481

Change-Id: If9ded626c2c47a8d5338c2e0aec3cf87075e0ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:20:59 +00:00
TreeHugger Robot
be8950ca3e Merge changes from topic "presubmit-am-0417584f5b544266a91cce6b85028daa" into tm-mainline-prod am: 4b5e50cfa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570481

Change-Id: If91bf22490daa328e3f539e3949bf5140a68f75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:20:17 +00:00
Automerger Merge Worker
80e838a31e Merge "Merge "Handling exception when per-use prompt cannot be generated" into tm-dev am: 246ecfd412 am: 84cd88a74d" 2022-04-13 11:20:10 +00:00
Automerger Merge Worker
c51f0377ff Merge "Merge "Default to true for updateDestinationFrame in BBQ" into tm-dev am: 40019d844a am: 5a05d95be5 am: 57b78b1ea3" 2022-04-13 11:19:58 +00:00
Eun-Jeong Shin
ef08fd08d0 Merge "Handling exception when per-use prompt cannot be generated" into tm-dev am: 246ecfd412 am: 84cd88a74d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17722828

Change-Id: I3fa3524c29009fbc90d29dd325dc8e3703606e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:19:43 +00:00
Automerger Merge Worker
a2aa947d33 Merge "Merge "Fine tune Spinner style" into tm-dev am: e5ee7aa25f am: f39e0145fe" 2022-04-13 11:19:29 +00:00
Chavi Weingarten
e840720e3d Merge "Default to true for updateDestinationFrame in BBQ" into tm-dev am: 40019d844a am: 5a05d95be5 am: 57b78b1ea3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693701

Change-Id: I70f26107f842e05299a64bf37386b34333d1e3d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:19:29 +00:00
Edgar Wang
b02e7838f6 Merge "Fine tune Spinner style" into tm-dev am: e5ee7aa25f am: f39e0145fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17620164

Change-Id: I3697784cf4c539f04687a9b3e2dcb48c2c7be1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:19:04 +00:00
Miranda Kephart
c536be0a76 Merge "Fix button ripple colors for screenshot/clipboard overlay" into tm-dev am: 24f2f55b6d am: fe1292a24f am: 0772883f23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17638183

Change-Id: Id40840c4b958754b234b53b22499041b099ad834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:18:48 +00:00
Anton Hansson
9fb2ddf7be Merge "Fix mistake in disting of api txt" am: 89ee3e6394 am: fc4d75a149 am: 26554faaf2 am: dc3afbe3ca am: cd63ed37fb am: 339a0e3983
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059568

Change-Id: I99ef60b6e95fa54c2294d8bf207ac35a4d61f40d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:18:13 +00:00
Automerger Merge Worker
0ef7de1e56 Merge "Merge changes from topic "presubmit-am-6809d34469994644a50f20911d86acf1" into tm-mainline-prod am: ef171fb8f7" 2022-04-13 11:18:06 +00:00
Automerger Merge Worker
a1b43ba89b Merge "Merge "[Bouncer] Apply interpolation to udfps" into tm-dev am: d405fc4491 am: e21d40e611 am: 667e2fc870" 2022-04-13 11:17:51 +00:00
Eun-Jeong Shin
18998e308c Merge changes from topic "presubmit-am-6809d34469994644a50f20911d86acf1" into tm-mainline-prod am: ef171fb8f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17722828

Change-Id: I7b1372891da683648e51248ca35438ee0cfd8f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:17:43 +00:00
Automerger Merge Worker
976d9380b9 Merge "Merge "AudioService: increase log size of device connection history" into tm-dev am: e33a37a865 am: 398eb70920" 2022-04-13 11:17:35 +00:00
TreeHugger Robot
7ce0f4e7f8 Merge "[Bouncer] Apply interpolation to udfps" into tm-dev am: d405fc4491 am: e21d40e611 am: 667e2fc870
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17660987

Change-Id: I204e77c4dbef608d45b8b300c7e334f4be39d4a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:17:30 +00:00
TreeHugger Robot
72e1416889 Merge "AudioService: increase log size of device connection history" into tm-dev am: e33a37a865 am: 398eb70920
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17707137

Change-Id: I032a1fa9b9f3e8175d96450d80635c472555c109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:17:04 +00:00
TreeHugger Robot
f7ba9ff5e8 Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7b23f67adc am: d318c998cf am: 39978f5785
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17406377

Change-Id: Ia89507e974e25ee0a8afe9fbe4a3c1ad95da41e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:16:46 +00:00
Automerger Merge Worker
314b29dc18 Merge "Merge changes from topic "presubmit-am-bbb2e523b7474f5fbf50acf046224c89" into tm-mainline-prod am: c12b7a099c" 2022-04-13 11:16:34 +00:00
Matt Pietal
35d2016aee [automerger skipped] Merge "User switcher - Update when multiple users enabled/disabled" into tm-dev am: 287c009326 am: fbc747d897 am: 0636a23f43 -s ours
am skip reason: Merged-In Idbaf97c599bacba2122cbce2d047eb59262ac63e with SHA-1 6f9dae7fe0 is already in history

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

Change-Id: I9887e35764982626feaba4427e76884365aff0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:16:02 +00:00
TreeHugger Robot
edd806c337 Merge changes from topic "presubmit-am-bbb2e523b7474f5fbf50acf046224c89" into tm-mainline-prod am: c12b7a099c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17707137

Change-Id: I9dbb48aaacf7d7052c15f6e6aec674645e8f57de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:16:01 +00:00
Automerger Merge Worker
9cd6536745 Merge "[automerger skipped] Merge "Exempt TV devices from Notification Permission" into tm-dev am: 3d5fff0b80 am: 56d9f385dc am: f286618a2e -s ours" 2022-04-13 11:15:38 +00:00
Automerger Merge Worker
ef13966e28 Merge "Merge "Move codes to gerrit for CollapsingToolbar" into tm-dev am: 2ee49c0f04 am: 58e0a7cd39" 2022-04-13 11:15:23 +00:00
Nate Myren
caab87ee73 [automerger skipped] Merge "Exempt TV devices from Notification Permission" into tm-dev am: 3d5fff0b80 am: 56d9f385dc am: f286618a2e -s ours
am skip reason: Merged-In I9aeef86871ab7ca912cc30e1cf4ebd84d7014992 with SHA-1 704a89094c is already in history

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

Change-Id: Icd08f6f3a9fd9dd0ab68c6b28e47241490f13edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:15:16 +00:00