Michal Karpinski
727c8caa7e
Merge "Don't allow PI-based starts and trampolines when sender is SYSTEM_UID and it happens to pass foregroundness check at the time of sending" into qt-dev am: 4886935329
...
am: 78ffe8177b
Change-Id: Ia23c0d5e64d28482799184ffee5e7dcb774ccd4d
2019-04-16 11:27:56 -07:00
Hai Zhang
4783c7ef71
Merge "Add more documentation for ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS." into qt-dev am: 4bf8532689
...
am: a547f31b9d
Change-Id: I1a7ddeadfddbbb1124e9465df09cc9662fa1eaff
2019-04-16 11:11:04 -07:00
Christopher Ferris
6541dd725a
Merge "Remove gMallocLeakZygoteChild."
2019-04-16 17:52:19 +00:00
Garfield Tan
c02e2d407d
Merge "Only reset layout seq when moved to a new display." into qt-dev am: cee859e26e
...
am: a2b9d58dcb
Change-Id: I53cdf061a69b2df365e31cbf00fbe0f25fa8ef09
2019-04-16 10:50:29 -07:00
Fabian Kozynski
b2ccd31b2c
Merge "Change the label color to textColorSecondary" into qt-dev am: 48e0b6b91b
...
am: b81ec3fadc
Change-Id: I765a943c496b1d0baafe2ac8b7c80b28b165055b
2019-04-16 10:36:02 -07:00
Michal Karpinski
78ffe8177b
Merge "Don't allow PI-based starts and trampolines when sender is SYSTEM_UID and it happens to pass foregroundness check at the time of sending" into qt-dev
...
am: 4886935329
Change-Id: Id6cf8e9659255fca002767d86e91d83866305249
2019-04-16 10:32:22 -07:00
Matt Pietal
f542529524
Merge "Sharesheet - Add copy text in response to UXR" into qt-dev am: aec888d7cd
...
am: 7b5a0a84e8
Change-Id: I1e7b2cc52b08cd3d14124f960903317c56d6450f
2019-04-16 10:29:36 -07:00
Hai Zhang
a547f31b9d
Merge "Add more documentation for ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS." into qt-dev
...
am: 4bf8532689
Change-Id: I6232954e0817717ba83b477af9aa3d9a5f1384ad
2019-04-16 10:24:26 -07:00
Garfield Tan
a2b9d58dcb
Merge "Only reset layout seq when moved to a new display." into qt-dev
...
am: cee859e26e
Change-Id: I261deee8a1f508a705e6a84c1a25f4d0e2525507
2019-04-16 10:12:26 -07:00
TreeHugger Robot
4886935329
Merge "Don't allow PI-based starts and trampolines when sender is SYSTEM_UID and it happens to pass foregroundness check at the time of sending" into qt-dev
2019-04-16 16:58:24 +00:00
Fabian Kozynski
b81ec3fadc
Merge "Change the label color to textColorSecondary" into qt-dev
...
am: 48e0b6b91b
Change-Id: I99f2c93dc92e1308ccb49c06f980c3d5acdc6a87
2019-04-16 09:58:17 -07:00
Jorim Jaggi
0a40cd4826
Merge "New activity transitions" into qt-dev am: 10ae84a9c1
...
am: cb0b479036
Change-Id: I1ffb29c3bc69f47208fb2e2f7e7d2e235d49e768
2019-04-16 09:53:04 -07:00
Matt Pietal
7b5a0a84e8
Merge "Sharesheet - Add copy text in response to UXR" into qt-dev
...
am: aec888d7cd
Change-Id: I69c27b1f4af6b84accddd277b1ab219879c1f65c
2019-04-16 09:51:59 -07:00
TreeHugger Robot
4bf8532689
Merge "Add more documentation for ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS." into qt-dev
2019-04-16 16:41:03 +00:00
TreeHugger Robot
cee859e26e
Merge "Only reset layout seq when moved to a new display." into qt-dev
2019-04-16 16:40:53 +00:00
Pat Plunkett
d6f65cd5e1
Merge "Fix VR-related system APIs" into qt-dev am: ef2e036f96
...
am: cc2a4954ab
Change-Id: I92101a3ca2960ff4616705d35f84fea7fc2e0283
2019-04-16 09:40:48 -07:00
Jorim Jaggi
eb40fabcda
Merge "Copy rects such that we don't modify state" into qt-dev am: 1c1c65ee56
...
am: 7398055eb0
Change-Id: Ife73bbd9f4fcc9ae4012e0c53b74c5c1542d239a
2019-04-16 09:26:36 -07:00
Jorim Jaggi
cb0b479036
Merge "New activity transitions" into qt-dev
...
am: 10ae84a9c1
Change-Id: Ie3fa9509630a3503300de6e69256aa4085c0009b
2019-04-16 09:24:36 -07:00
Jorim Jaggi
3205518bbf
Merge "Revert "Revert "Fix issue in attached layouting""" into qt-dev am: d072df4d6e
...
am: d800ccad22
Change-Id: I41d412a8f604c9b0f3d94bf083d5b44b65ea40e7
2019-04-16 09:20:35 -07:00
Fabian Kozynski
48e0b6b91b
Merge "Change the label color to textColorSecondary" into qt-dev
2019-04-16 16:15:26 +00:00
TreeHugger Robot
aec888d7cd
Merge "Sharesheet - Add copy text in response to UXR" into qt-dev
2019-04-16 16:15:24 +00:00
Pat Plunkett
cc2a4954ab
Merge "Fix VR-related system APIs" into qt-dev
...
am: ef2e036f96
Change-Id: Id2448189d314aeafbd1f38c61f31cb0f37c2ec60
2019-04-16 09:15:23 -07:00
TreeHugger Robot
10ae84a9c1
Merge "New activity transitions" into qt-dev
2019-04-16 16:01:13 +00:00
Jorim Jaggi
7398055eb0
Merge "Copy rects such that we don't modify state" into qt-dev
...
am: 1c1c65ee56
Change-Id: Id0f05d010b38952026465dfc709b0054d929f20f
2019-04-16 08:59:05 -07:00
jiayuzhou
d4bb0d4ac0
Merge "make onGetSupportedVoiceActions return @NonNull and return empty set by default" into qt-dev am: b6abb2c59c
...
am: bfc919acd2
Change-Id: Ic751f5aac109c437ec59315d093c01ed2fd65a24
2019-04-16 08:56:43 -07:00
Jorim Jaggi
d800ccad22
Merge "Revert "Revert "Fix issue in attached layouting""" into qt-dev
...
am: d072df4d6e
Change-Id: I3aeb01ef69b2fc4973d980249a48afbe20b8091a
2019-04-16 08:53:13 -07:00
TreeHugger Robot
ef2e036f96
Merge "Fix VR-related system APIs" into qt-dev
2019-04-16 15:49:33 +00:00
Hayden Gomes
74a07df93b
Merge "Adding comment to sync native and java matchers"
2019-04-16 15:49:32 +00:00
TreeHugger Robot
1c1c65ee56
Merge "Copy rects such that we don't modify state" into qt-dev
2019-04-16 15:44:24 +00:00
jiayuzhou
bfc919acd2
Merge "make onGetSupportedVoiceActions return @NonNull and return empty set by default" into qt-dev
...
am: b6abb2c59c
Change-Id: Ic4c9ff95b64c6a6ea7d7b98374a2d5227990dc74
2019-04-16 08:43:09 -07:00
Android Build Merger (Role)
402949803b
Merge "Merge "Always send Adjustment for importance" into qt-dev am: 37f27b53a8 am: e66c7ec8a0"
2019-04-16 15:37:44 +00:00
Jan Althaus
b786994d72
Merge "Always send Adjustment for importance" into qt-dev am: 37f27b53a8
...
am: e66c7ec8a0
Change-Id: I4cf3d0abcd503bcde3691484c6f452e72ba36570
2019-04-16 08:37:16 -07:00
Philip P. Moltmann
b20cf04b32
Merge "Refactor updatePermissions path"
2019-04-16 15:36:01 +00:00
Philip P. Moltmann
cc66ee1e93
Merge "Remove setAllPkgModesToDefault"
2019-04-16 15:35:44 +00:00
TreeHugger Robot
d072df4d6e
Merge "Revert "Revert "Fix issue in attached layouting""" into qt-dev
2019-04-16 15:35:22 +00:00
TreeHugger Robot
b6abb2c59c
Merge "make onGetSupportedVoiceActions return @NonNull and return empty set by default" into qt-dev
2019-04-16 15:28:22 +00:00
Jan Althaus
e66c7ec8a0
Merge "Always send Adjustment for importance" into qt-dev
...
am: 37f27b53a8
Change-Id: Ic5af5a5d7d93afb35b5cd197ed6def811c6d41e7
2019-04-16 08:26:59 -07:00
TreeHugger Robot
37f27b53a8
Merge "Always send Adjustment for importance" into qt-dev
2019-04-16 15:13:33 +00:00
Orion Hodson
00d3a28acf
Merge "Retire android::nio_{get,release}Buffer"
2019-04-16 15:13:18 +00:00
Hai Zhang
395a639d2f
Merge "Fix crash when clearing package preferred activities." into qt-dev am: 815397ad47
...
am: 230e252c4f
Change-Id: Ibd4d9be9ba612d5edb0f8c8ce5a35fda462b6574
2019-04-16 08:06:58 -07:00
Hai Zhang
230e252c4f
Merge "Fix crash when clearing package preferred activities." into qt-dev
...
am: 815397ad47
Change-Id: I9c59aa26853b491c49b543fad66aa4f34ff4a11d
2019-04-16 07:57:55 -07:00
Tyler Gunn
6be7ca9974
Merge "Add PhoneAccountHandle method to check if 2 accts are from same CS." into qt-dev am: b1145bd87e
...
am: 507d3a5b50
Change-Id: I0cd8140522d41afb9aeecf5c5f2cc78fb70999e3
2019-04-16 07:53:03 -07:00
Michal Karpinski
2927b542ab
Don't allow PI-based starts and trampolines when sender
...
is SYSTEM_UID and it happens to pass foregroundness check
at the time of sending
It could lead to abuses like directing the user to Settings app
and then giving a PI through any API, so that app could open
activity/trampoline due to Settings app (SYSTEM_UID) being fg.
PI-based starts where sender is SYSTEM_UID will no longer be
supported based on foregroundness check. Any such starts need
to now be explicitly whitelisted (see b/124858756).
Also, ignore windows of type TYPE_APPLICATION_STARTING in
isAnyNonToastWindowVisibleForUid() check.
Bug: 129563343
Test: atest WmTests:ActivityStarterTests
Test: atest BackgroundActivityLaunchTest
Test: atest CtsActivityManagerDeviceTestCases:ActivityStarterTests
Test: atest WmTests:RootWindowContainerTests
Change-Id: I563f71f0b1c7922d8c675d2e4feed909f43446be
2019-04-16 15:50:13 +01:00
TreeHugger Robot
815397ad47
Merge "Fix crash when clearing package preferred activities." into qt-dev
2019-04-16 14:45:23 +00:00
Orion Hodson
d0f3e3a006
[automerger skipped] Merge "Ensure all fields of AutoBufferPointer are initialized" into qt-dev am: 0fd71745d6
...
am: c1596ec23a -s ours
am skip reason: change_id I319512aaede7ba8af5d013c9281417695abf9099 with SHA1 e522c99430 is in history
Change-Id: I5a1cbc4bac5ec5976c967b499595eb4b61f89ea9
2019-04-16 07:44:48 -07:00
Tyler Gunn
507d3a5b50
Merge "Add PhoneAccountHandle method to check if 2 accts are from same CS." into qt-dev
...
am: b1145bd87e
Change-Id: Iaf26c428482c81592d07e046aa0b26703c0937a8
2019-04-16 07:39:30 -07:00
Orion Hodson
c1596ec23a
Merge "Ensure all fields of AutoBufferPointer are initialized" into qt-dev
...
am: 0fd71745d6
Change-Id: Ia1697f22e3b55f325f0d74ab9c501bfa9dccf7b0
2019-04-16 07:30:12 -07:00
Ben Wagner
f5137c56ed
Merge "Move AlphaFilterCanvas to new API."
2019-04-16 14:20:13 +00:00
Tyler Gunn
b1145bd87e
Merge "Add PhoneAccountHandle method to check if 2 accts are from same CS." into qt-dev
2019-04-16 14:16:33 +00:00
TreeHugger Robot
0fd71745d6
Merge "Ensure all fields of AutoBufferPointer are initialized" into qt-dev
2019-04-16 14:14:29 +00:00