Commit Graph

756990 Commits

Author SHA1 Message Date
Eric Biggers
0a600afdb1 [automerger skipped] Remove HardwareAuthToken parameter from addUserKeyAuth am: 5eb0659999 am: 2e4db6c49e am: 67fb478f37 -s ours am: 455f94f8f7 -s ours am: 9ae7fcf4a1 -s ours
am skip reason: Merged-In I06e7c36787cc7f384acb7742737c3b1cfa50f0ae with SHA-1 6b220a95e9 is already in history

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

Change-Id: I8bd7a6a16aa8ae5e0d690c0bfb48203171be579d
2022-03-16 17:41:20 +00:00
Eric Biggers
b7764ac0c7 [automerger skipped] Don't pass HardwareAuthToken to unlockUser() in non-SP verifyCredential am: 665b5f9228 am: 753693671d am: 67701fa376 -s ours am: 6299d06f9b -s ours am: 3b9ec03c46 -s ours
am skip reason: Merged-In I3c176ba282f4c7901dd09fe3d66cfd380794fb48 with SHA-1 3654b097b1 is already in history

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

Change-Id: I20779839b52fb51137682e0394bb63d495bd71b0
2022-03-16 17:40:45 +00:00
Eric Biggers
9c5c9f83c9 [automerger skipped] Remove non-SP based setLockCredentialInternal() am: 0566abd58c am: e024ab7105 am: 2f76c72161 -s ours am: 4b6d839f4d -s ours am: 1c29a3fd22 -s ours
am skip reason: Merged-In Ieefffb2641f5c12dfcd7556f529830328e8ba292 with SHA-1 2dd97def29 is already in history

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

Change-Id: I2e36e31098289dff09f2c51658e88e182823975b
2022-03-16 17:40:08 +00:00
Eric Biggers
aacfd7763c [automerger skipped] Remove HardwareAuthToken support from FakeStorageManager am: 401e447e10 am: 7028c0f4ab am: 164ba67a9f -s ours am: 2a1c274c33 -s ours am: 49ea383903 -s ours
am skip reason: Merged-In Ida3a989ecea974fe79568e381cf0e6ff3fe1f1eb with SHA-1 2e10d6394a is already in history

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

Change-Id: I4f89071d6aaf2df09e50d9a0852cdd9137ed1e85
2022-03-16 17:39:34 +00:00
Joshua Mccloskey
16e6a1e14f Merge "Updated Fingerprint enrollment" into tm-dev am: 2cbbe4e032 am: 0f551d8634
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190169

Change-Id: I4a001d5961af68a9d4fd8a5976c403ad2b126344
2022-03-16 17:37:03 +00:00
Evan Chen
e91fa2e28c Merge "Fix typo for Computer profile" into tm-dev am: 9359169d16 am: 961f6f301d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17198560

Change-Id: Iec9b85fac2488b4b92c7e8fa2e409ed394a0a653
2022-03-16 17:35:37 +00:00
Guojing Yuan
55447ca82d Merge "Update CDM binding flags" into tm-dev am: f8bd335980 am: 133abae1a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185750

Change-Id: Iba3a0ea36abd6b2bbc1df06d19ecc5fe5ade35f3
2022-03-16 17:34:49 +00:00
Jorim Jaggi
11cb42a364 Merge "Fix lock contention between DMS and ATMS" into tm-dev am: 593bdad07f am: 43978663cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071464

Change-Id: I4b1815f53ed1e93572b4fae2596f46919d12e421
2022-03-16 17:33:05 +00:00
Garfield Tan
0bbbfadc50 Merge "Add argument checks in setScale and setCrop" into tm-dev am: bce590e356 am: 613d0e5ce5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17127507

Change-Id: I5d58a1432f18650921cf467404745ace6a574004
2022-03-16 17:32:08 +00:00
Julia Reynolds
08478651fe Merge "Add an OEM configurable limit for zen rules" into tm-dev am: 15de8ff0ba am: 9d6b48048e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046131

Change-Id: I217a83fdd1a878f4bceaa0149588629571e7a39f
2022-03-16 17:30:23 +00:00
Ahaan Ugale
684cee4430 Merge "Fix ServiceConnector failing unbind if not connected." into tm-dev am: 0ede4b88ff am: d4b278634a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17193618

Change-Id: Ie2806b25ff27bac4246f8ea5966aaec2f6499f7b
2022-03-16 17:29:30 +00:00
Jay Aliomer
309b5edc63 Merge "Disable empty KeyguardCoordinatorTest test" into tm-dev am: 8b50a56841 am: 6e071925ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17197697

Change-Id: Ie5440125a4a3c8894cb7ea683687686ca6453c9d
2022-03-16 17:28:56 +00:00
Eric Laurent
329f955acd Merge "Audio: SpatializerHelper: fix native audio server death handling" into sc-v2-dev am: 5cbb4d7d27 am: 96b78e41cf am: 1af73c8276 am: 8706dc6bba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17195443

Change-Id: I0a98b9ed79885e84351d5b225a75c8405761cff2
2022-03-16 17:28:05 +00:00
Eric Laurent
f130e6704e Merge changes from topic "presubmit-am-b4bd5ce7b4f34be08b452106d0393ce8" into sc-v2-dev-plus-aosp am: a0b428bbb7 am: 35f87bdb2d am: 3a9266f788
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17195443

Change-Id: I1f24d2bc5ecc0412958d431fb1de1aa81dc7a126
2022-03-16 17:27:20 +00:00
Tiger Huang
a4608c87bc Merge "Use ClientWindowFrames to collect frames computed by WindowLayout" into tm-dev am: c1cf2472f6 am: eda1a61e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17184386

Change-Id: I5b5bc61db446baa6d85e2a43fc02c3dda13e0208
2022-03-16 17:26:23 +00:00
Matt Pietal
b4289475be [automerger skipped] [automerge] [DO NOT MERGE] Ignore flaky tests 2p: 5c85eadaa8 am: ce5e3337bd -s ours am: 1824214857 -s ours am: 21f246ac1c -s ours am: 8ea0eb7019 -s ours am: d13f630d22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7c4b7d98a059e3fac961237c8167d9560489fcd
2022-03-16 17:25:36 +00:00
TreeHugger Robot
68593fa8e3 [automerger skipped] Merge "Defer MessagingMessage#recycle until bind ends" into sc-v2-dev am: d50e5886fe -s ours am: 6cd812bf85 -s ours am: b2ea510d5a -s ours am: b7f6b878c3 -s ours
am skip reason: Merged-In I924f917fbf757d2c3866fcd60de2fbfccae2eb6a with SHA-1 3c52f4881d is already in history

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

Change-Id: I1fb1a9aae724842e8afb5b81944064257bb45221
2022-03-16 17:25:11 +00:00
Eric Biggers
d902b000e9 [automerger skipped] Merge changes from topic "remove-fde" am: 841350e6ac am: 741d018f3d am: e404aac63c -s ours am: 44246661f1 -s ours am: f03329c373 -s ours
am skip reason: Merged-In Ic24a5b029bdf51dec622d1b70cef9ef26c3d54c5 with SHA-1 ad08fcc781 is already in history

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

Change-Id: Ifbe5e9aeaf85f7afde658ec40ebe40cb7e4ec1e5
2022-03-16 17:24:30 +00:00
Eric Biggers
28e47db058 [automerger skipped] Stop checking FDE password cache am: f33dbe0540 am: 5576b11597 am: 67721acf6d -s ours am: a3b2d2e200 -s ours am: d3ce728f36 -s ours
am skip reason: Merged-In If1bb80dfcc015aeea19916a88c89a4067e6ada32 with SHA-1 6ab6ad829e is already in history

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

Change-Id: I3aa12d90aea97e3e39fdeb3d14f74c6387f329b6
2022-03-16 17:23:53 +00:00
Eric Biggers
549bd7cc3d [automerger skipped] Remove checks for FDE in 'adb backup' am: bd03d7606d am: 615f824f8c am: 3bcf9a260a -s ours am: 24131c057f -s ours am: 4eecc9face -s ours
am skip reason: Merged-In Idc72d2a4c3e8bfa10a32cdc57884159b37635e81 with SHA-1 99a7078cdf is already in history

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

Change-Id: If81dae9d3ad1b14230c02190dfcfa946264992c4
2022-03-16 17:23:35 +00:00
Steven Moreland
d8edfad7f2 Merge "ParcelableHolder: assert stability on read" am: 180aa227f6 am: a9febdf125 am: 6f2efc48ba am: e9889e0fc1 am: 31d05a4133
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020960

Change-Id: I088cbae570307fa1d52ac392cf8b07129d41327c
2022-03-16 17:22:24 +00:00
Automerger Merge Worker
679abda127 Merge "[automerger skipped] Merge "Used single TCP configuration for devices" am: 71649aa3f4 am: 5c11d472e2 am: d80c079b8f -s ours am: 8cf7c034de -s ours" into tm-mainline-prod am: 14491b255f -s ours
am skip reason: Merged-In I1f19e1217f7e7da37b3dd3b511d4859d77ec7bad with SHA-1 ee410d34a6 is already in history

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

Change-Id: I11d42ab69dd64d772df530bd4d0bd604d9aa0c3d
2022-03-16 17:21:31 +00:00
Jack Yu
129e1c98f6 [automerger skipped] Merge "Used single TCP configuration for devices" am: 71649aa3f4 am: 5c11d472e2 am: d80c079b8f -s ours am: 8cf7c034de -s ours am: 26f8ef2e1f -s ours
am skip reason: Merged-In I1f19e1217f7e7da37b3dd3b511d4859d77ec7bad with SHA-1 ee410d34a6 is already in history

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

Change-Id: I61db85176d197d937faa87d989a2215720e92a9a
2022-03-16 17:20:59 +00:00
Jack Yu
eaf1ca3a5e [automerger skipped] Merge "Used single TCP configuration for devices" am: 71649aa3f4 am: 5c11d472e2 am: d80c079b8f -s ours am: 8cf7c034de -s ours am: 3f9aaa0f38 -s ours
am skip reason: Merged-In I1f19e1217f7e7da37b3dd3b511d4859d77ec7bad with SHA-1 ee410d34a6 is already in history

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

Change-Id: I4106c96795896b8670bfb7764951d8caa198fd6b
2022-03-16 17:20:01 +00:00
TreeHugger Robot
3c9e43f2ea [automerger skipped] Merge changes from topic "presubmit-am-5e22897cb56644e4abaab85d2e0ec30e-sc-v2-dev" into sc-v2-dev-plus-aosp am: fefc274c86 -s ours am: 73d88c5133 -s ours am: c36c197dbb -s ours
am skip reason: Merged-In I924f917fbf757d2c3866fcd60de2fbfccae2eb6a with SHA-1 88f4dbce89 is already in history

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

Change-Id: I6da82e7125266d9c31003ea9868a704448104f8e
2022-03-16 17:19:22 +00:00
Presubmit Automerger Backend
60a77762c4 [automerger skipped] [automerge] Defer MessagingMessage#recycle until bind ends 2p: 3c52f4881d am: e6038b6cb3 -s ours am: 992cd2ce5a -s ours am: be773744d1 -s ours
am skip reason: Merged-In I924f917fbf757d2c3866fcd60de2fbfccae2eb6a with SHA-1 88f4dbce89 is already in history

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

Change-Id: I23497ad92235f215f063387d21ba65b6f8447e93
2022-03-16 17:19:06 +00:00
Nikita Dubrovsky
9ad3f51af3 Merge "Update READ_CLIPBOARD_IN_BACKGROUND to be grantable via roles" into tm-dev am: 30ccb6bca9 am: 284b85d084
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145144

Change-Id: Ia46ddd940980f648c4b6b57b89d6a680077f0135
2022-03-16 17:18:05 +00:00
Michael Wachenschwanz
eb7d253a63 Merge "Fix mobile radio battery consumption double counting" 2022-03-16 17:07:02 +00:00
Matt Pietal
4727f0d4e3 Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into sc-mainline-prod am: be8370734f am: b633ed2b9c am: f898e00903
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17159706

Change-Id: Ibeb53d6d5140579343a7366822f0a7425a0e9062
2022-03-16 17:06:06 +00:00
Matt Pietal
9b477a80de Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into tm-dev am: 8fb55d4172 am: 3732447a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17159706

Change-Id: Idcbcaf7acfd203439cbef7e1ab1bf79f287a32e6
2022-03-16 17:04:56 +00:00
Matt Pietal
bd9403a1a2 [automerger skipped] [automerged blank] [DO NOT MERGE] Ignore flaky tests 2p: 5c85eadaa8 2p: f6e92bd5ff am: 78ea1cf5f2 am: c4ed6ba1a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If363f152175454e36dec068b9d435ee7eed3e069
2022-03-16 17:04:41 +00:00
Hongwei Wang
4034930ecb [automerger skipped] Merge "Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a59072018" into sc-mainline-prod am: 3579487d9e -s ours am: f103a2b19c -s ours am: 341383f8ad -s ours
am skip reason: Merged-In Ie657d15d9edb9d07555bd166b5919bb12cb217e6 with SHA-1 ebe8550d03 is already in history

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

Change-Id: Ia0171586f58a77c39206adfa8b9e9d04690fe59b
2022-03-16 17:04:02 +00:00
Hongwei Wang
e11f9a5c80 [automerger skipped] Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a59072018 am: 9b5b669cd6 -s ours am: c3bea5e4df -s ours am: c2c57024ed -s ours
am skip reason: Merged-In Ie657d15d9edb9d07555bd166b5919bb12cb217e6 with SHA-1 ebe8550d03 is already in history

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

Change-Id: Ib331e56a785b3865502f95d3fdd9b006ba0db2a3
2022-03-16 17:03:36 +00:00
TreeHugger Robot
25ee32f615 Merge "[RemoteInputView] move data fields to Controller" into tm-dev am: cb2836e240 am: 6f271a1bc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17188894

Change-Id: Ie7c17a4ab8deb80abf41c738fd3c31be033870a4
2022-03-16 17:02:23 +00:00
Ahaan Ugale
91652baaa7 Merge "Use flag to control the restart period value." into tm-dev am: d252376ed4 am: 66a4a59bb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183529

Change-Id: Ifbf71f55a52781582292984086a8f978c6c32352
2022-03-16 17:01:36 +00:00
TreeHugger Robot
dcb083955d [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-v2-dev am: da1701ce29 -s ours am: 25d5a2449e -s ours am: 5aa7a6bda6 -s ours am: 9820ed123f -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 256b5f08a8 is already in history

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

Change-Id: Icc3034a90cc9380561f614071a0750bd0575dfdf
2022-03-16 17:00:39 +00:00
Mady Mellor
376e3adbb6 Merge "Allow submodule owners to approve resources in shell" am: 0bd7c7b932 am: 9963532438 am: e19ca05540 am: 1facd8a57b am: f68636ab22
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2024744

Change-Id: I0b76cb973328f5963f2152ee9b2ccb1cbb39c0ee
2022-03-16 16:59:49 +00:00
Automerger Merge Worker
5f7881b1ef [automerger skipped] Merge changes from topic "am-af9507788a8b4331adddceb5131a255e" into tm-dev am: f848370f8d -s ours am: b90cb90df4 -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 21e48cf26b is already in history

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

Change-Id: I5c1dc40a7940ca9bdbe6b8596e0d6c6d55ca6b89
2022-03-16 16:58:48 +00:00
TreeHugger Robot
a7f73db88c [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev-sc-v2-dev" into sc-v2-dev-plus-aosp am: 9b3222c464 -s ours am: d0b6f10a47 -s ours am: fd226bde6b -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 21e48cf26b is already in history

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

Change-Id: If83cff73bec51f7b25a53f0cae192f658daceb4a
2022-03-16 16:58:32 +00:00
Bernardo Rufino
287afbd760 Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into tm-dev am: 53b1556921 am: bd40194a14
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17182670

Change-Id: I2f6356647778036868798470ca69bfbfec84b03f
2022-03-16 16:57:44 +00:00
Raissa De Guzman
f6d40ed520 Merge "Re-add PackageVerifierTest to presubmit" into tm-dev am: c66fa16f1e am: 622e2d86a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17070869

Change-Id: If3e64f3e01316ee7da98a7a5cc2dd6f5c46b0ce5
2022-03-16 16:56:16 +00:00
Michael Wachenschwanz
4890eeeee8 Merge "Fix units is getActiveRadioDuration documentation" into tm-dev am: 98a2f3a88b am: b87d0d4a9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190007

Change-Id: If799af262804f3e5ef8656f8be19e093d3dd57e7
2022-03-16 16:55:40 +00:00
TreeHugger Robot
1592d03861 Merge "Use compat framework to gate session actions" into tm-dev am: 96a7b9ee75 am: adfefec85c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17158683

Change-Id: I7a47cd34b9d5c8bb885fd9a2d23aa61c7d954fe6
2022-03-16 16:54:56 +00:00
Ahaan Ugale
c3ec3eb2a8 Merge "Trusted Hotword: Disable periodic restarts." into tm-dev am: e76e08874f am: 76972fa963
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190848

Change-Id: Ie4f60bf8b4c497d90192ef97de733280e50645ce
2022-03-16 16:54:12 +00:00
Ytai Ben-tsvi
c027e4244b Merge "Correctly initialize recognition events" into tm-dev am: fe5ac369f9 am: 23c8af927c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17188331

Change-Id: I2136af21f7d6b86fb94687ea2ac04d356684814d
2022-03-16 16:53:39 +00:00
Riddle Hsu
4247fbd3d5 Merge "Preserve task when clearing top activities" into tm-dev am: 597af5dae7 am: c426294d06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190849

Change-Id: I0cae7ee7d466f01ac5954dc243a60f6abcdc9665
2022-03-16 16:52:58 +00:00
Tiger Huang
8916b2aff6 Merge changes from topics "presubmit-am-5e82b57d626c41308e1301904b87a9f4", "presubmit-am-bf1f6ea5e8904183a244a4f4fcdf02bf" into tm-dev am: 12af01de23 am: 993556bd4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17157343

Change-Id: I24fb08b8f7f2b8162c8898e9c2b6b2409bea3bf5
2022-03-16 16:52:14 +00:00
Shaowei Shen
c747d92634 Merge "[Output Switcher] Update current device string based on product" into tm-dev am: 2b3a67a7f0 am: fa37714beb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17181724

Change-Id: Ib9064f10ce6c0ab8d4a51d4dd366d2eb3cc3397a
2022-03-16 16:50:59 +00:00
Kholoud Mohamed
a6351739d3 [automerger skipped] Merge "Start an activity cross profile in same task." into tm-dev am: 784e20708d am: b59867b5fb -s ours
am skip reason: Merged-In I21c258c5962daefb32f65779035f4ba8f0474da7 with SHA-1 96ca7241ff is already in history

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

Change-Id: Iecffc154e62cd4278884da8eb9a3b9dfd0f12ffe
2022-03-16 16:50:15 +00:00
Arthur Hung
af138761fe Merge "Prevent NPE for onKeyDown and onKeyUp" into tm-dev am: b1c7853e29 am: dc76d7d337
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17130385

Change-Id: I2faea2478d49a81294baaf33112cb3ef21670141
2022-03-16 16:48:20 +00:00