summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-09Snap for 8164116 from e61f6debacb72154f83da17a04a338ea2adda1dc to ↵android-mainline-12.0.0_r94android12-mainline-resolv-releaseAndroid Build Coastguard Worker
mainline-resolv-release Change-Id: Ied40982edda2bff2432cba521e9cec5f7817b72a
2022-02-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
sc-dev am: f67b906f06 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795129 Change-Id: I103e426be77a259f434fad3910ef500d08e67761
2022-02-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
sc-dev am: 149512df23 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795498 Change-Id: If1ef6c79cebc30e4292f454d52bda4876f63d14b
2022-02-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
sc-dev am: 038a340e67 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16793875 Change-Id: I7911b616b3da522275a055c2a245ee768f357c56
2022-02-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devBill Yi
2022-02-08Merge changes from topic "presubmit-am-a4a19a7ff98b4684a251eb77e61ed0b8" ↵Bill Yi
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4994c652f Import translations. DO NOT MERGE ANYWHERE
2022-02-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devBill Yi
2022-02-08Merge changes from topic "presubmit-am-0cf5a4c6b1b84821831d9b314edd5ed6" ↵Bill Yi
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5415c5f7cf Import translations. DO NOT MERGE ANYWHERE
2022-02-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devBill Yi
2022-02-08Merge changes from topic "presubmit-am-d5aeba84add64a9a9dd59331ecf1ff06" ↵Bill Yi
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 51db0dd6bb Import translations. DO NOT MERGE ANYWHERE
2022-02-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodBill Yi
2022-02-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-02-08Merge "Migrate NetworkStack modules to use modules-utils" into sc-mainline-prodTreeHugger Robot
2022-02-08Migrate NetworkStack modules to use modules-utilswescande
StateMachine stand-alone library will replace all specific filegroup created for module. It will be then moved into modules-utils preconditions is already a modules-utils Bug: 198418216 Tag: #refactor Test: Build Merged-In: I6de6c2575adf896e283672ebae82431f5c8172af Change-Id: I6de6c2575adf896e283672ebae82431f5c8172af
2022-02-07Merge changes from topic "toast-security-fix-sc-dev" into sc-dev am: 799f0a7f66Vishnu Nair
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16740079 Change-Id: Ia50c3c558e675f95b76930c6bae62f7c653db3c3
2022-02-07SurfaceControl: Add setDropInputMode api am: a84612483fVishnu Nair
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16740078 Change-Id: I1c0fb49a2bd7124f6472267d1eed0929c71d34fb
2022-02-07Merge changes from topic "toast-security-fix-sc-dev" into sc-devVishnu Nair
* changes: Drop input for toast and child surfaces SurfaceControl: Add setDropInputMode api
2022-02-07Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING ↵TreeHugger Robot
permission." into rvc-dev am: e9a8a931b2 am: dd43d7b82b am: 537621f528 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16612525 Change-Id: If6d7ea59da2aa3746856d3a5c27e5bcd86e0f7a7
2022-02-07Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING ↵TreeHugger Robot
permission." into rvc-dev am: e9a8a931b2 am: dd43d7b82b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16612525 Change-Id: I98538899f24aba6230a253bee690bb3c594882e9
2022-02-07Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING ↵TreeHugger Robot
permission." into sc-dev am: f4c5343867 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16612527 Change-Id: Ifd5492f375240e56ff757b57922389a1eec4f8e3
2022-02-07Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING ↵TreeHugger Robot
permission." into rvc-dev am: e9a8a931b2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16612525 Change-Id: Ib68e11539aef9e9f002a3ed9ae62b0aae409cbc3
2022-02-07Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING ↵TreeHugger Robot
permission." into rvc-dev
2022-02-07Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING ↵TreeHugger Robot
permission." into sc-dev
2022-02-07[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 6b223ea532 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795132 Change-Id: Idabd0e119338136eb2834583b1c9561bf40d67f6
2022-02-07[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: eae3010a35 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795126 Change-Id: I5a7c02cebb14b7d18f708547b0abf50291068682
2022-02-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-02-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2022-02-07Merge changes from topic "presubmit-am-26c0397313d2451caba69c018e522693" ↵TreeHugger Robot
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d77e32da00 Import translations. DO NOT MERGE ANYWHERE
2022-02-07Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2022-02-07Merge changes from topic "presubmit-am-4b65c4c86e044cc1a5997f5736d8d1ba" ↵TreeHugger Robot
into sc-mainline-prod * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 52a6ad7ca0 Import translations. DO NOT MERGE ANYWHERE
2022-02-07Merge "Delete DhcpResults from frameworks/base." into sc-mainline-prodTreeHugger Robot
2022-02-06Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prodTreeHugger Robot
2022-02-05[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d77e32da00Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795132 Change-Id: I3e4e7bbd872e8e76b662bed06f1c2b9c0c9508cc
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idea2deab56a5b9ae1e75870c63a3759a7020c226
2022-02-05[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4994c652fBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795129 Change-Id: I44aab885b5b9402897a3c322e0e3e5a19cd92a3b
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib989febdc6f9740f7c5ddaaceee544f2fff1ef28
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0ab6c0f3c7f3190723e047a6404cde9dc740981c
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3360ff42fc8da50e6d36e040a90ae8c759b9af16
2022-02-05[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 51db0dd6bbBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16793875 Change-Id: Ia61182d6e5ea41afc56ba61cb2b74115e05bfa1c
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I57d6e90543148332e4a26e22d42e16edf5bf474d
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I783dddf765f7ef79918ef74c6653287aa4be8c06
2022-02-05[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5415c5f7cfBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795498 Change-Id: I614290b27a9ccc612cabc0fe402b3fea1a0638d8
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5db8f20068107f64644a6280224f5d3f3f16a6c2
2022-02-05[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 52a6ad7ca0Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795126 Change-Id: I8dfb1b6c3a744469ed6cd562d1cba1ea5291e14e
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I96610ce042ef7be842ade5093dccacceb1af065f
2022-02-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I13482826efdf5df1b7699cdf4df13030b2d29224
2022-02-05Merge "Validate pid can be trusted" into sc-dev am: 45312b8382Ganesh Olekar
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958 Change-Id: I98982569be5032db5b302c10b6b925edb93b762c
2022-02-05Merge "Validate pid can be trusted" into sc-devGanesh Olekar
2022-02-04Drop input for toast and child surfacesVishnu Nair
Toasts that do not have the trustedOverlay flag should not receive input. These windows should not have any children, so force this hierarchy of windows to drop all input by setting a flag on the toast window state which will apply the DROP_INPUT flag on all windows with an input channel. This is to prevent malicious apps from parenting surfaces with input channels to the toast window. Test: show toast and check if input feature flag DROP_INPUT id set via dumpsys Bug: b/197296414 Merged-In: I316b76b685ca5030fd8aa91283555efcce4d6994 Change-Id: I316b76b685ca5030fd8aa91283555efcce4d6994
2022-02-04Delete DhcpResults from frameworks/base.Lorenzo Colitti
This class is only used by NetworkStack, so move it to the NetworkStack project. Test: m Change-Id: I356ee7b24613e84b8a90ddccd6d25d0742d13ae7