Commit Graph

765248 Commits

Author SHA1 Message Date
Automerger Merge Worker
f02ad34b46 Merge "Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89e0 am: 126314b371" into tm-d1-dev-plus-aosp 2022-05-11 21:24:12 +00:00
Matt Casey
4f6a51868f Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89e0 am: 126314b371
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188891

Change-Id: Icd032afd4b8943aa67284984866bfff8e9880f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:23:59 +00:00
Edgar Arriaga García
f02d76aeca Merge "Resend remaining VMAs on partial compaction due to failure" into tm-dev am: a47d028ed0 am: 40e7c81c5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18193321

Change-Id: Idd468e5d0708de3a18ad3b1a6414ed69d71caa4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:23:53 +00:00
Kholoud Mohamed
ffe644ad25 Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822a9 am: b144935fd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: I09fac92fdf07e99d711496377c2446ab3438a164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:23:20 +00:00
kholoud mohamed
5de2223615 RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs am: 50f529a1e1 am: 03350f1cb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: Ic78148b426bcd8af6ac930029c4cfeb5fec586fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:23:13 +00:00
Tom Chen
200b75df86 Merge "[DO NOT MERGE] T Subcard logging - Media Card code path" into tm-dev am: c6caf1cfdc am: 264e9594f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: I7d9a878599e645158b247e6ad88c09d105860206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:22:55 +00:00
Tom
2f3e9fef05 [DO NOT MERGE] T Subcard logging - Media Card code path am: 49e76804b8 am: d08948bd08
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: I218b2ddf605bdea80eccfaa609f5b63c0f144aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:22:49 +00:00
Automerger Merge Worker
0dd53423a0 Merge "Merge "Use lint database from api_version_public" am: 39ebb3b0c0 am: d708548986" into tm-dev-plus-aosp am: c3b789f86c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092243

Change-Id: I126482692be549ea380bf98bcd479027e20be1ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:22:28 +00:00
Brad Ebinger
df9c7d68a7 Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev am: 82c131e385 am: 021c4e03fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298852

Change-Id: Ibc4a058bb9ddfc7cccc0a46a352ecd15f27bfcd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:21:10 +00:00
Yu-Han Yang
5769cd0615 Merge "Restart location requests after HAL restarts" into tm-dev am: e19d5be9ad am: 6b9829ab91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18289083

Change-Id: I24be9e3673d202967f9de02555fbda89bcc77abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:17:56 +00:00
Automerger Merge Worker
239f1ada6e Merge "Merge "Fix memory leak with RenderNodeAnimator" into tm-dev am: b9a8ed8b70 am: b27c97ac73" into tm-d1-dev-plus-aosp 2022-05-11 21:16:33 +00:00
Nader Jawad
6408f48dc9 Merge "Fix memory leak with RenderNodeAnimator" into tm-dev am: b9a8ed8b70 am: b27c97ac73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290468

Change-Id: I8c2cae161e4598d5c3088bd3cd15baf18cc908ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:16:29 +00:00
Ronish Kalia
86afce92ba Merge "Use config instead of local string for qr scanner" into tm-dev am: bbd351fe0e am: 6acd9fbbd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186905

Change-Id: I0186a8a11a18628c03491aadf3f2ce25c14b4be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:16:23 +00:00
Matt Casey
91c25d900d Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89e0 am: bf0d76e742
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188891

Change-Id: I4e759d8b626238311c4b6938dce87e32f3fbe768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:15:41 +00:00
Kholoud Mohamed
ce5d6f750d Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822a9 am: f97d55055f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: I55c6a73016bf2754cb667262e6f7b178dda24071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:15:20 +00:00
kholoud mohamed
fe915a5dde RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs am: 50f529a1e1 am: d721a3edc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: Iac3bebf6314902251b50980fbc44171c1388c682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:15:06 +00:00
Ronish Kalia
39f83605a4 Merge "Use config instead of local string for qr scanner" into tm-dev am: bbd351fe0e am: 228d8b116e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186905

Change-Id: I50f279a24e780f5717ca3d21dbf9e85b5ee45e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:14:31 +00:00
Nikita Ioffe
7417a3819b Merge "Add apex_available platform to CtsShimPrivUpgrade" into tm-dev am: bda42bee6f am: e6d259945e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309969

Change-Id: I25839b14972568694f274cc0b13e18d589ae827d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:14:08 +00:00
Calvin Pan
43b167f717 Merge "Filter the locale not in resources" into tm-dev am: 53c979939c am: d17b651d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245872

Change-Id: Ic92744fc2d96f65b68660c482e6e3c4f5cb955c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:13:45 +00:00
Keun-young Park
33e1c60b29 Merge "Continue dexopt for other packages when a package reports an error" into tm-dev am: 3136e202b3 am: 87cd28ec33
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18175791

Change-Id: I5c737a86aa0beee92821796c4ec9bba737100dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:12:44 +00:00
Automerger Merge Worker
82237fba09 Merge "Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b54 am: 796c9aa13a" into tm-d1-dev-plus-aosp 2022-05-11 21:12:14 +00:00
Nate Myren
9bcf24529f Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b54 am: 796c9aa13a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083366

Change-Id: I150b1789af97fb7eca729991d5c21f68de5116cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:12:07 +00:00
Nikita Ioffe
46f7b5164a Merge "Add apex_available platform to CtsShimPrivUpgrade" into tm-dev am: bda42bee6f am: b23889c90b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309969

Change-Id: Ifb6e894fe4963144312bb68b1d72db5c0c58ff89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:12:00 +00:00
Automerger Merge Worker
bc4d9a420b Merge "Merge "Reset mock NM before each of the tests that checks it" into tm-dev am: 1df465ed29 am: 90deedf949" into tm-d1-dev-plus-aosp 2022-05-11 21:11:32 +00:00
Yuri Lin
a3ecb7d9cb Merge "Reset mock NM before each of the tests that checks it" into tm-dev am: 1df465ed29 am: 90deedf949
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282484

Change-Id: I9e7a09eed9656a572b7927e5553a52fafa7f1cbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:11:26 +00:00
Calvin Pan
c2320a7785 Merge "Filter the locale not in resources" into tm-dev am: 53c979939c am: d00dd4ee2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245872

Change-Id: I1f79c1e18ade33550a9eae81cd3dbf5e4174549c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:11:13 +00:00
Steve Elliott
e6ea7dc5a9 [automerger skipped] Merge "Don't show "Clear All" w/ redacted notifs" into tm-dev am: e6e4946731 am: 8204fbd52c -s ours
am skip reason: Merged-In Ibc66576d28a48f7c82cad875ed2dcb57a7b23f10 with SHA-1 63122cbde2 is already in history

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

Change-Id: Ib98213d0809f7d1316910cb5f4bcffa25ca37af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:10:57 +00:00
Edgar Arriaga García
40e7c81c5e Merge "Resend remaining VMAs on partial compaction due to failure" into tm-dev am: a47d028ed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18193321

Change-Id: I5d11f84df715b85219a7e45ea5ed4adae644ffc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:07:55 +00:00
Tom Chen
264e9594f7 Merge "[DO NOT MERGE] T Subcard logging - Media Card code path" into tm-dev am: c6caf1cfdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: I3767cb04a5c6237d6ee06e3d842828838e42d6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:07:10 +00:00
Tom
d08948bd08 [DO NOT MERGE] T Subcard logging - Media Card code path am: 49e76804b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: Ide7fb57d65816bd77699fbc07d3eb4850e4dd818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:07:03 +00:00
Keun-young Park
bea119c51a Merge "Continue dexopt for other packages when a package reports an error" into tm-dev am: 3136e202b3 am: 132cf59f57
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18175791

Change-Id: I2480aa3f2f5685d78591495c0f2d44d6b50dab30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:06:13 +00:00
David Coffin
7d5c7652e8 Merge "Make SEND_SAFETY_CENTER_UPDATE internal|privileged" into tm-dev am: b863765330 am: 9851671b92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231665

Change-Id: Iaad693003bfad416bf2fa26d2e068f3991f3451b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:05:37 +00:00
Nate Myren
214260900e Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b54 am: 882e36e24c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083366

Change-Id: I2cddcd52dae3a77c4c91479eefb358f3c677362b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:03:38 +00:00
Yan Han
5444db2a36 Merge changes I0579b3af,If7ecd588 into tm-dev am: f7b504cece am: bdba73e302
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18230085

Change-Id: I25e0f67d03ca2249d6cb2950dbad75baf75abaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:03:22 +00:00
Yuri Lin
668dab1ceb Merge "Reset mock NM before each of the tests that checks it" into tm-dev am: 1df465ed29 am: 9340be20d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282484

Change-Id: I837cc8308f2a50a8cbaea7c0558d0171846d69b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:02:38 +00:00
Alex Buynytskyy
9eafd854c9 Merge "Make caller wait for installd to become available." into tm-dev am: 9804076394 am: 3b329702fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284939

Change-Id: Idd10c0ce382feec97c778800e094d5e85ccf2cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:02:19 +00:00
Brad Ebinger
021c4e03fa Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev am: 82c131e385
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298852

Change-Id: I3ad459df13d01e4216569b259ed1a5be4137f5ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:02:02 +00:00
Steve Elliott
ef0da20d1f Merge "Don't show "Clear All" w/ redacted notifs" into tm-dev am: e6e4946731 am: 70cd55a6cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183599

Change-Id: I6bf80a7cd5342dbdf9c2507e955d553063d4e1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:01:28 +00:00
Saumya Pathak
ad892f1720 Merge "Fix bug in getStorageVolumesIncludingSharedProfiles" into tm-dev am: 7f24e585e2 am: ca7e14f164
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164345

Change-Id: Ia75b6d6c7f4b9c7aee1ba0ff7c206dae557b544f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:00:36 +00:00
TreeHugger Robot
4c3d0cd471 [automerger skipped] Merge "Reland: Change input injection security model" into tm-dev am: d0f6ad2f30 am: 200c269fc7 -s ours
am skip reason: Merged-In I503e4f087501e3aecf2c18b4b1d27e51ecda59ac with SHA-1 0f9ea02be0 is already in history

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

Change-Id: Ic63befd2fb2cb869621c0c3fab5b213ed5eb6732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:59:51 +00:00
Yu-Han Yang
6b9829ab91 Merge "Restart location requests after HAL restarts" into tm-dev am: e19d5be9ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18289083

Change-Id: Id7b1e1eb2b5783c801ad6c0d776163d6446715b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:58:40 +00:00
Ayush Sharma
402074cbe1 Merge "Add string for set separate work lock link" into tm-dev am: 7e71b424c1 am: f9f3e236e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281663

Change-Id: I2f9541a346549070ab2f10e7de431b8ee99c8872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:56:18 +00:00
David Coffin
b01b8217da Merge "Make SEND_SAFETY_CENTER_UPDATE internal|privileged" into tm-dev am: b863765330 am: 63ee30000c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231665

Change-Id: I4cc1c7abac1af22a1c4a92a5bb7f9036e267b894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:54:30 +00:00
Michał Brzeziński
a9963f82e9 Merge "Fixing notifications not visible in split shade after rotations" into tm-dev am: 48324b7bc7 am: 8fbd866f9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18230545

Change-Id: I4098f5f507efe8597855ededc091c883e8b43f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:53:52 +00:00
Automerger Merge Worker
8a394ea701 Merge "Merge "Improving comment inside expandWithQs for special split shade case" into tm-dev am: 7144969d6b am: 5fe2745f4a" into tm-d1-dev-plus-aosp 2022-05-11 20:53:45 +00:00
Michał Brzeziński
24141de96d Merge "Improving comment inside expandWithQs for special split shade case" into tm-dev am: 7144969d6b am: 5fe2745f4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281170

Change-Id: I1d381dff121a53cc233f1c632ec43c193f4ae0d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:53:07 +00:00
Michał Brzeziński
5d78533b52 Merge "Improving comment inside expandWithQs for special split shade case" into tm-dev am: 7144969d6b am: 5fe2745f4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281170

Change-Id: If210dc79087d414bc01780976ea5c9a6408e0815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:51:41 +00:00
Vania Desmonda
0c77dc2042 Merge "Revert "Avoid calling updateSurface twice when dimming is applied."" into tm-dev am: 05aa78241d am: 965cae5878
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231745

Change-Id: If7c9a71ec2574b4536ecb3990f6d02c28d064925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:51:13 +00:00
Nader Jawad
b27c97ac73 Merge "Fix memory leak with RenderNodeAnimator" into tm-dev am: b9a8ed8b70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290468

Change-Id: I62e922f544f19f36333329cba8e8da23a36fcef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:50:13 +00:00
Mariia Sandrikova
a3c3936466 Merge "Letterbox resizable fixed orientation activities in multi-window." into tm-dev am: 8d7c5727d2 am: f46cd5ec56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185147

Change-Id: I5e881d3a388e4a7cd7920320eefa3ad34bd7c8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:50:08 +00:00