Lyn Han
|
548b6146e7
|
Merge "Encapsulate background width updates to ActivatableNotificationView" into tm-dev am: da82413344
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17205159
Change-Id: I7565a49fd8479ab3608377e3a5099bfc118f0bc6
|
2022-03-16 17:55:49 +00:00 |
|
Ling Ma
|
32076363d6
|
Merge "Unhide API isPersistent and getProfileId" into tm-dev am: 0d1d776e3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17199572
Change-Id: I029aafec71af705ca0c42295d0f2322f5d1e0a4f
|
2022-03-16 17:54:57 +00:00 |
|
Yixiao Luo
|
2748e2eeda
|
Merge "TIAF: Change on API Review: First round API council questions" into tm-dev am: ea42ada7e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17111723
Change-Id: I71aa48c7fa3217d84c6c74abe7b33c2d72ed596e
|
2022-03-16 17:54:13 +00:00 |
|
Jerry Chang
|
5348dd4277
|
Merge "Support drag to switch split position for not multi-instance app" into tm-dev am: aab0963fdd am: 279b48c9a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124809
Change-Id: Ie94b7b08e082bf693b55eab2de04d87e6f7e3b13
|
2022-03-16 17:52:34 +00:00 |
|
Jerry Chang
|
aa017127d1
|
Merge "Consider screen insets when setting smallestWidthDp" into tm-dev am: fc447969a9 am: e48c468b3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17147681
Change-Id: I76abfb44017cf8edbebff603797748b93a7f273a
|
2022-03-16 17:51:36 +00:00 |
|
Jared Duke
|
288f6c1c29
|
Merge "Revert "Update READ_CLIPBOARD_IN_BACKGROUND to be grantable via ..."" into tm-dev am: 392aca75af am: f27ff476c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206854
Change-Id: Ic7c790c8d0c92454c423cc13f783da578028cfc2
|
2022-03-16 17:50:38 +00:00 |
|
Hui Yu
|
e3d46c7002
|
Merge "Remove SERVICE_FOREGROUND_TIMEOUT_MSG when scheduling service restart." into tm-dev am: dccf3ec68b am: a7b9d280a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190178
Change-Id: Ib6810e1c1b2fe60c6dceee12d86dc87562cbef69
|
2022-03-16 17:48:39 +00:00 |
|
Lorenzo Colitti
|
4bcff160ff
|
Merge "Rename setUidForeground to noteUidForeground" am: b5a5e6ce75 am: 5cf65dbef4 am: 5543650bc2 am: 547a4d6565 am: 939509ea07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2018717
Change-Id: Ibd1af8c42c65580a49efeeebbbe5ed071d7ee200
|
2022-03-16 17:47:27 +00:00 |
|
Lyn Han
|
da82413344
|
Merge "Encapsulate background width updates to ActivatableNotificationView" into tm-dev
|
2022-03-16 17:46:59 +00:00 |
|
Jimmy Shiu
|
75e4dfbd34
|
Merge "Add postAndWait() trace for calculating frame drawing time" into tm-dev am: 5591cf0712 am: 19556120bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17184229
Change-Id: Ic6563c89fd744bbc2c1e8d2d02e58214fc02ff3b
|
2022-03-16 17:46:45 +00:00 |
|
Tom Natan
|
d4f21467e5
|
Merge "[18/n] Letterbox Education: start dialog enter animation after all shell transitions have finished" into tm-dev am: 5059dbde7b am: 18fc6f5b8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17136515
Change-Id: I1578d9e1dba5e0c6a85cd059eaacb733da94ea5b
|
2022-03-16 17:45:58 +00:00 |
|
Ryan Lin
|
2d3cac2262
|
Merge "Fix the flaky AccessibilityMagnificationTest#testListener" into tm-dev am: 840f39893e am: 38c455e4df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183452
Change-Id: If5e29497d4cb70db9cfbd6660f00e69b18a21ee4
|
2022-03-16 17:45:08 +00:00 |
|
Jared Duke
|
16620f3252
|
Merge changes from topic "revert-17083643-large-icons-tm-XHQQYXZDHH" into tm-dev am: 7bc013b627 am: 66e9ddb3a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17199637
Change-Id: Id8d0b98dd731d17bca1bfd8cdd4922dd53017ab6
|
2022-03-16 17:44:21 +00:00 |
|
Kathy Chen
|
c4eb7e69d5
|
Merge "Address API review feedback for AmbientContext. Add shell method for more test coverage. Do not unregister request from the same client and delegate to AiAi to handle it." into tm-dev am: 4bb44e08b4 am: 11d3a37d8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17200885
Change-Id: If03065dab9c7038b272914841aed9fb70d861307
|
2022-03-16 17:43:23 +00:00 |
|
Eric Biggers
|
461d33cea7
|
[automerger skipped] Merge changes from topic "remove-auth-token" am: 6a8f891205 am: 6cdb257f37 am: 0aa923336e -s ours am: 01a1c9500c -s ours am: ad602f029b -s ours
am skip reason: Merged-In I35ce09412f47f2f2a17a371d518a0a518b70bfb6 with SHA-1 b1bcec9c7d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021760
Change-Id: If5f70108c1ece3a0d8fc8d77465744bf2fb632f9
|
2022-03-16 17:41:57 +00:00 |
|
Eric Biggers
|
2838a0c843
|
[automerger skipped] Remove HardwareAuthToken parameter from clearUserKeyAuth am: d04de5ce97 am: e4f51c74ee am: 6564d7138d -s ours am: a776b9a60d -s ours am: 52669f9740 -s ours
am skip reason: Merged-In I739b519b0e91293acbf018020891d68b3090c175 with SHA-1 2a8ab47782 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021759
Change-Id: I5eecfe46d3c47abb4d1c52da3632dad783966844
|
2022-03-16 17:41:37 +00:00 |
|
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 |
|
Ling Ma
|
0d1d776e3a
|
Merge "Unhide API isPersistent and getProfileId" into tm-dev
|
2022-03-16 17:40:34 +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 |
|
Yixiao Luo
|
ea42ada7e9
|
Merge "TIAF: Change on API Review: First round API council questions" into tm-dev
|
2022-03-16 17:21:33 +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 |
|