Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,591 Commits 3 Branches 0 Tags
3feb77e98cb6554e28babb37f485eedb111e5a8d
Commit Graph

660591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Presubmit Automerger Backend
3feb77e98c [automerge] Security fixes for PendingIntent related apis in LauncherApps 2p: e41e04bb8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16778744

Bug: 209607104
Change-Id: I953b389219a2699516121237745770114852f758
Merged-In: Id262b9a0de58d8834c85d925cf84bb44b8b99742
 2022-02-09 03:12:22 +00:00
Pinyao Ting
e41e04bb8c Security fixes for PendingIntent related apis in LauncherApps 
Allowing arbitrary activityOptions during the creation of PendingIntent
is a source of security vulnerability. This CL removes activityOptions
from the call-site.

Bug: 209607104
Test: manual
Change-Id: Id262b9a0de58d8834c85d925cf84bb44b8b99742
Merged-In: Id262b9a0de58d8834c85d925cf84bb44b8b99742
 2022-02-09 03:12:10 +00:00
Bill Yi
e61f6debac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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 20:14:54 +00:00
Bill Yi
66fe10d451 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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 20:14:19 +00:00
Bill Yi
6459460bd4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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-08 20:13:54 +00:00
Bill Yi
f67b906f06 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-02-08 19:37:27 +00:00
Bill Yi
fe32532d3f Merge changes from topic "presubmit-am-a4a19a7ff98b4684a251eb77e61ed0b8" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4994c652f
  Import translations. DO NOT MERGE ANYWHERE
 2022-02-08 19:37:27 +00:00
Bill Yi
149512df23 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-02-08 19:36:33 +00:00
Bill Yi
2ea5f44c38 Merge changes from topic "presubmit-am-0cf5a4c6b1b84821831d9b314edd5ed6" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5415c5f7cf
  Import translations. DO NOT MERGE ANYWHERE
 2022-02-08 19:36:33 +00:00
Bill Yi
038a340e67 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-02-08 19:34:03 +00:00
Bill Yi
ff1f813178 Merge changes from topic "presubmit-am-d5aeba84add64a9a9dd59331ecf1ff06" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 51db0dd6bb
  Import translations. DO NOT MERGE ANYWHERE
 2022-02-08 19:34:03 +00:00
Bill Yi
a121690a63 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-02-08 19:33:44 +00:00
TreeHugger Robot
88192a8cca Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-02-08 18:07:45 +00:00
TreeHugger Robot
f580c95edd Merge "Migrate NetworkStack modules to use modules-utils" into sc-mainline-prod 2022-02-08 17:22:24 +00:00
wescande
b05beb460e Migrate NetworkStack modules to use modules-utils 
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-08 14:40:40 +00:00
Vishnu Nair
0750ba8c65 Merge changes from topic "toast-security-fix-sc-dev" into sc-dev am: 799f0a7f66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16740079

Change-Id: Ia50c3c558e675f95b76930c6bae62f7c653db3c3
 2022-02-07 23:42:37 +00:00
Vishnu Nair
1a130170c9 SurfaceControl: Add setDropInputMode api am: a84612483f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16740078

Change-Id: I1c0fb49a2bd7124f6472267d1eed0929c71d34fb
 2022-02-07 23:42:30 +00:00
Vishnu Nair
799f0a7f66 Merge changes from topic "toast-security-fix-sc-dev" into sc-dev 
* changes:
  Drop input for toast and child surfaces
  SurfaceControl: Add setDropInputMode api
 2022-02-07 23:22:22 +00:00
TreeHugger Robot
174e44c9be Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING 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-07 22:20:26 +00:00
TreeHugger Robot
537621f528 Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING 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-07 22:07:48 +00:00
TreeHugger Robot
a8474e4e53 Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING permission." into sc-dev am: f4c5343867 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16612527

Change-Id: Ifd5492f375240e56ff757b57922389a1eec4f8e3
 2022-02-07 21:55:04 +00:00
TreeHugger Robot
dd43d7b82b Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING permission." into rvc-dev am: e9a8a931b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16612525

Change-Id: Ib68e11539aef9e9f002a3ed9ae62b0aae409cbc3
 2022-02-07 21:54:46 +00:00
TreeHugger Robot
e9a8a931b2 Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING permission." into rvc-dev 2022-02-07 21:39:58 +00:00
TreeHugger Robot
f4c5343867 Merge "Restrict AdbManager broadcasts to apps with MANAGE_DEBUGGING permission." into sc-dev 2022-02-07 21:39:47 +00:00
TreeHugger Robot
8da9931fc8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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 21:13:28 +00:00
TreeHugger Robot
ddde57dc6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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-07 21:12:51 +00:00
TreeHugger Robot
51f0e6fc99 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-02-07 20:48:02 +00:00
TreeHugger Robot
6b223ea532 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-02-07 20:44:30 +00:00
TreeHugger Robot
88d6504861 Merge changes from topic "presubmit-am-26c0397313d2451caba69c018e522693" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d77e32da00
  Import translations. DO NOT MERGE ANYWHERE
 2022-02-07 20:44:30 +00:00
TreeHugger Robot
eae3010a35 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-02-07 20:33:24 +00:00
TreeHugger Robot
4bc1421133 Merge changes from topic "presubmit-am-4b65c4c86e044cc1a5997f5736d8d1ba" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 52a6ad7ca0
  Import translations. DO NOT MERGE ANYWHERE
 2022-02-07 20:33:24 +00:00
TreeHugger Robot
1ee85f1d37 Merge "Delete DhcpResults from frameworks/base." into sc-mainline-prod 2022-02-07 05:53:11 +00:00
TreeHugger Robot
67e4b07e88 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-02-06 07:14:44 +00:00
Bill Yi
ab353df2d2 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d77e32da00 
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-05 21:40:02 +00:00
Bill Yi
d77e32da00 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idea2deab56a5b9ae1e75870c63a3759a7020c226
 2022-02-05 21:39:26 +00:00
Bill Yi
c8b15a02bb [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4994c652f 
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-05 21:15:53 +00:00
Bill Yi
e4994c652f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib989febdc6f9740f7c5ddaaceee544f2fff1ef28
 2022-02-05 21:15:20 +00:00
Bill Yi
f01eadee9f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0ab6c0f3c7f3190723e047a6404cde9dc740981c
 2022-02-05 21:07:39 +00:00
Bill Yi
798541ed6c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3360ff42fc8da50e6d36e040a90ae8c759b9af16
 2022-02-05 21:01:22 +00:00
Bill Yi
cd03fc2803 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 51db0dd6bb 
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-05 20:33:12 +00:00
Bill Yi
51db0dd6bb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I57d6e90543148332e4a26e22d42e16edf5bf474d
 2022-02-05 20:32:42 +00:00
Bill Yi
f73792bef3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I783dddf765f7ef79918ef74c6653287aa4be8c06
 2022-02-05 20:29:27 +00:00
Bill Yi
30f3b6cc25 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5415c5f7cf 
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-05 18:51:55 +00:00
Bill Yi
5415c5f7cf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5db8f20068107f64644a6280224f5d3f3f16a6c2
 2022-02-05 18:51:27 +00:00
Bill Yi
d829feed8e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 52a6ad7ca0 
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-05 17:29:51 +00:00
Bill Yi
52a6ad7ca0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I96610ce042ef7be842ade5093dccacceb1af065f
 2022-02-05 17:29:09 +00:00
Bill Yi
bdc3f0fef0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I13482826efdf5df1b7699cdf4df13030b2d29224
 2022-02-05 17:05:01 +00:00
Ganesh Olekar
fd12e311a2 Merge "Validate pid can be trusted" into sc-dev am: 45312b8382 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I98982569be5032db5b302c10b6b925edb93b762c
 2022-02-05 04:13:15 +00:00
Ganesh Olekar
45312b8382 Merge "Validate pid can be trusted" into sc-dev 2022-02-05 03:56:26 +00:00
Vishnu Nair
6ac8376cd7 Drop input for toast and child surfaces 
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-04 02:14:42 +00:00