Commit Graph

9161 Commits

Author SHA1 Message Date
Automerger Merge Worker
8e75f68968 Merge "Update reserved permission controller flags name" into rvc-dev am: a285890237 am: 94e881fd42 am: be859913ad am: 1128aad712
Change-Id: Id975fe599f8190d057a3c1514d5b5b7b55c241fd
2020-03-13 19:43:09 +00:00
Evan Severson
a285890237 Merge "Update reserved permission controller flags name" into rvc-dev 2020-03-13 18:30:25 +00:00
Automerger Merge Worker
25de7d1ed6 Merge "Add window layout affinity." into rvc-dev am: 7fcb7d59c4 am: 807b8e42df am: 3d0ba25d61 am: a24ecf75a0
Change-Id: I603abe4ab9a8008e3b169d89a3b5933d562a349b
2020-03-13 17:07:59 +00:00
Garfield Tan
7fcb7d59c4 Merge "Add window layout affinity." into rvc-dev 2020-03-13 16:16:18 +00:00
Philip P. Moltmann
d7a823623f Merge "Rename featureId -> attributionTag" into rvc-dev 2020-03-13 14:26:31 +00:00
Garfield Tan
5901e7ce4f Add window layout affinity.
Window layout affinity is used to combine launch params records for
activities from the same UID that have the same value.

I didn't choose to replace component name as the key to launch params
map by window layout affinity because keeping both has some good traits
when app is updated with some window layout affinity changes:
1) The record with component name is still updated even if it starts to
have a window layout affinity so we don't have to worry about the
orphaned record;
2) Activity that changes/loses window layout affinity can always use the
last launch param that activity saves, instead of starting from default
launch behavior again;
3) App removal can still naturally clean up all useless records.

Those come at a cost that we need to iterate all activities in the same
window layout affinity when getting the launch params, but it's OK
because it's not very common to have specific task affinities and in
cases where they do the number of activities sharing the same task
affinities is limited.

Bug: 146015757
Test: Manual test that 2 activities in a single test app shares the same
launch params record.
Test: atest LaunchParamsPersisterTests

Change-Id: Idb2e7509c6bdf22ac6c9cf41059e9c696419028b
2020-03-12 17:04:45 -07:00
Automerger Merge Worker
fd5ecf9713 Merge "Do not set referrerUri on SessionInfo for non-owners" into rvc-dev am: 987b12ddcf am: f9f22897ff am: cbc31f6424 am: 12094d4957
Change-Id: Idf4ba7f8a7c4e59d743a87b1f35e0d6a4de3c0dd
2020-03-12 23:30:34 +00:00
Pinyao Ting
2c68c87afd Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." 2020-03-12 21:49:31 +00:00
Evgenii Stepanov
91482ccc8a Merge "Add "enableGwpAsan" tag to android manifest." into rvc-dev 2020-03-12 21:13:25 +00:00
Automerger Merge Worker
095faa011b Add overloaded API with activity options parameter am: a9f0052af5 am: 78a39a52ca am: e76d52d576 am: 5e2d90373b
Change-Id: I82e8f71ed6ff4899b0de48f94fde62fff30c4066
2020-03-12 20:12:37 +00:00
Automerger Merge Worker
cbc31f6424 Merge "Do not set referrerUri on SessionInfo for non-owners" into rvc-dev am: 987b12ddcf am: f9f22897ff
Change-Id: I03eb7090df85721d8e47fcce072d9f4fff068f65
2020-03-12 19:35:04 +00:00
Philip P. Moltmann
12ac3f406f Rename featureId -> attributionTag
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
2020-03-12 19:26:10 +00:00
Patrick Baumann
987b12ddcf Merge "Do not set referrerUri on SessionInfo for non-owners" into rvc-dev 2020-03-12 19:16:40 +00:00
Philip P. Moltmann
aea50fc06a Rename featureId -> attributionTag
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
2020-03-12 11:47:51 -07:00
Eugene Susla
72a2e8fd73 Merge "Revert "Introduce a manifest flag for auto-revoke exemption request"" 2020-03-12 18:04:11 +00:00
Automerger Merge Worker
78a39a52ca Add overloaded API with activity options parameter am: a9f0052af5
Change-Id: I6992551c89d878c785ad97cf9d9da64c5069d692
2020-03-12 17:57:08 +00:00
Alex Kershaw
6fa3741fdb Merge "Add overloaded API with activity options parameter" into rvc-dev 2020-03-12 17:47:59 +00:00
Evgenii Stepanov
102d3d8669 Add "enableGwpAsan" tag to android manifest.
This tag can be used to enable and disable gwp-asan on applications and
their components. The default setting is disabled, except for the system
applications which are enabled with a small probability (approx. 1% of
processes).

Enabling gwp-asan can be used to crowd test an app.

This change includes a compat feature that overrides the default value
of enableGwpAsan for an app.

Bug: 149991821
Test: atest CtsGwpAsanTestCases
Exempt-From-Owner-Approval: cherrypick
Merged-In: I5eb647c517e5487b1d1eed6b9a43242490f19289
Change-Id: I5b4db666f38af846927f88702cc690f0916cadb1
2020-03-12 17:19:23 +00:00
Automerger Merge Worker
220d609a70 Merge "Remove misleading comments" into rvc-dev am: c688e204e1 am: a148b4e3cd am: d78af383a2 am: 4fed1d44f6
Change-Id: I185bbe7b089b4aa4f1e5b232503483d9edb7235b
2020-03-12 16:21:05 +00:00
Philip P. Moltmann
1d56b5eca8 Merge "Rename featureId -> attributionTag" 2020-03-12 15:01:04 +00:00
TreeHugger Robot
c688e204e1 Merge "Remove misleading comments" into rvc-dev 2020-03-12 03:39:07 +00:00
Automerger Merge Worker
244ba47f05 Making time-zone an API constant am: 2e7408eddb am: 5fd18b033d am: 085bf87210 am: 4021198db5
Change-Id: Id9d3db95200952ca6c09117d68ca6173824ab955
2020-03-12 02:37:02 +00:00
Eugene Susla
b01074232c Revert "Introduce a manifest flag for auto-revoke exemption request"
This reverts commit 76badfcf14.

Reason for revert: Superceded by ag/10519773
Test: presubmit
Bug: 146513245

Change-Id: If7320c44cd774093ddd62a45e0fd01c528dc6499
2020-03-11 18:57:13 -07:00
Automerger Merge Worker
5fd18b033d Making time-zone an API constant am: 2e7408eddb
Change-Id: I92458f87eb0963330f98a3fe20c3336391e3f5b0
2020-03-12 01:43:19 +00:00
Alex Kershaw
a9f0052af5 Add overloaded API with activity options parameter
This is from calendar team's feedback. It allows them to
create a nice animation when launching the activity. This also mirrors
the implementation in the Activity class.

Fixes: 151150552
Test: atest com.android.cts.devicepolicy.CrossProfileAppsHostSideTest#testStartActivityIntent
Change-Id: Ie120896e50d8b2c033b9cb156357bd696eb033e0
2020-03-12 01:29:27 +00:00
TreeHugger Robot
592181386c Merge "Making time-zone an API constant" into rvc-dev 2020-03-12 01:23:28 +00:00
Philip P. Moltmann
8a06c2870e Rename featureId -> attributionTag
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
2020-03-11 23:52:32 +00:00
Pinyao Ting
021faf9d19 Remove misleading comments
The display order of the shortcuts is solely determined by launcher apps
implementation at their own discretion, the rank of the shortcut merely
serves as a guideline. Thus removing the misleading paragraph to prevent
confusions.

Bug: 150254995
Test: make
Change-Id: I4cdb9a5779edfdb5b56659e4787b3f13e7e3054e
2020-03-11 23:42:58 +00:00
Automerger Merge Worker
21e6a66b20 Merge "WindowContext: Add @WindowType intdef" into rvc-dev am: 76b221c84b am: 22c79f5dfe am: e94751f933 am: dcadf88af7
Change-Id: I2fe3e7b68ef635df902c5f23edb7b9dfdc87dce7
2020-03-11 22:42:02 +00:00
TreeHugger Robot
76b221c84b Merge "WindowContext: Add @WindowType intdef" into rvc-dev 2020-03-11 22:02:27 +00:00
Pinyao Ting
d043004cee Wrap ShortcutQuery in a parcelable wrapper object and pass it
direcly through aidl.

As part of the effort to simplify the implementation of
LauncherAppsService, We create ShortcutQueryWrapper, a parcelable
object that wraps ShortcutQuery and pass it to LauncherAppsService
directly.

Bug: 148104408
Test: atest ShortcutQueryTest
Change-Id: I2e2ccaf38ef6bd558b4b02e647a7e263c7e612a9
2020-03-11 22:00:31 +00:00
Automerger Merge Worker
81158d5477 Merge "Clarify InstallSourceInfo javadoc." into rvc-dev am: eaf14b274a am: 2b4867adb1 am: e24e4edd02 am: e6e5d42545
Change-Id: I150514cc5df4ff5b627fa1a3c08c04f61b9ea178
2020-03-11 21:31:54 +00:00
TreeHugger Robot
eaf14b274a Merge "Clarify InstallSourceInfo javadoc." into rvc-dev 2020-03-11 19:34:21 +00:00
Patrick Baumann
6bc126b040 Do not set referrerUri on SessionInfo for non-owners
This change leaves the referrerUri field null when the caller leading to
its production is not the owner of the session.

Bug: 142125338
Test: atest SessionReferrerUriTest
Change-Id: I84679ea0636aa2097e25e23813c48134c9cc1d75
2020-03-11 11:47:05 -07:00
Adrian Roos
9c17e537c7 WindowContext: Add @WindowType intdef
Fixes: 151156902
Test: make checkapi
Change-Id: I966f8cd305189a54a5de48b03e5b4bdd51700fdf
2020-03-11 16:08:16 +01:00
Automerger Merge Worker
1877f273c3 Adds support for wildcards in IntentFilter am: eb526105cb am: 6dd3bdf73f am: 84eedfecc5 am: 6707ccd02d
Change-Id: Ib92b1b76bfb39e2d5d8c7aa89909aee1a899fbf0
2020-03-11 01:22:13 +00:00
Suprabh Shukla
2e7408eddb Making time-zone an API constant
This is already effectively an API the way it is documented.
Updating all the references of the hard-coded constant.

Test: make update-api && make

Bug: 151112929
Change-Id: Iadeb03c516215cfc51bc8604b67250348d5a4375
2020-03-10 18:05:02 -07:00
Automerger Merge Worker
6dd3bdf73f Adds support for wildcards in IntentFilter am: eb526105cb
Change-Id: I8d6399e0177867d6393d0998321785dbe70f9604
2020-03-11 00:38:39 +00:00
Patrick Baumann
93a9ab17ef Merge "Adds support for wildcards in IntentFilter" into rvc-dev 2020-03-11 00:30:51 +00:00
Automerger Merge Worker
fff3a1bca8 Merge "Merge "Give hidden API behavior to legacy apps." into rvc-dev am: a7a96ad6f8 am: 314eb8f16b" into rvc-d1-dev-plus-aosp am: 059370c6f9 am: d0db148bcd
Change-Id: I039fc6b9674fb31ac5733daf95a1157b58921d3b
2020-03-11 00:00:29 +00:00
Automerger Merge Worker
8eca114736 Give hidden API behavior to legacy apps. am: 8b0cff7108
Change-Id: Ic247e0c6280baf8b41cf0f3c85ecd7f6916ad1cc
2020-03-10 23:14:48 +00:00
Jeff Sharkey
a7a96ad6f8 Merge "Give hidden API behavior to legacy apps." into rvc-dev 2020-03-10 23:03:41 +00:00
Jeff Sharkey
8b0cff7108 Give hidden API behavior to legacy apps.
Starting in R, there is a new public API overload that delivers a
flags argument.  Some apps may be relying on a previous hidden API
that delivered a userId argument, and this change is used to control
delivery of the new flags argument in its place.

There are dozens of these hidden API users are in the system UID,
either in the system process or the Settings app, so we hard-code
giving them the legacy behavior, since refactoring would be messy
between internal and AOSP branches.

Also adjust incoming and outgoing method signatures to use slightly
more flexible Collection<Uri>, which has handy methods like
contains() and isEmpty().

Bug: 150939131
Test: atest --test-mapping packages/providers/MediaProvider
Test: atest FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: If6a77449e19215cf1c60d4217e62fc04b0959bfc
2020-03-10 16:36:21 -06:00
Automerger Merge Worker
5be449c5e8 Merge "Add intent for auto revoke UI" into rvc-dev am: e9b4b0009b am: d3573ee8c2 am: 7a2108d1ce am: 0429b54f29
Change-Id: Ifbe3445ed6190ed00a102605463f6d586c493f70
2020-03-10 22:06:40 +00:00
Nate Myren
e9b4b0009b Merge "Add intent for auto revoke UI" into rvc-dev 2020-03-10 18:55:52 +00:00
Automerger Merge Worker
dc8bcf7208 Merge "Rename ApexContext to ApexEnvironment." into rvc-dev am: e6dbe2b880 am: 86fe0229f1 am: 591cc11972 am: c64b9d5a61
Change-Id: I42eccfb31be918280336194a944e97d4404daf7d
2020-03-10 11:27:22 +00:00
Oli Lan
e6dbe2b880 Merge "Rename ApexContext to ApexEnvironment." into rvc-dev 2020-03-10 10:20:13 +00:00
Automerger Merge Worker
e2c67d131d Merge "Replace auto-revoke whitelist permission flags with appop" into rvc-dev am: 623468289f am: e410b63af1 am: be5c003e8e am: 68e7312596
Change-Id: I9a7d44ef3d1865c59b7212cb8b12f3408ee0208c
2020-03-10 04:26:23 +00:00
Eugene Susla
623468289f Merge "Replace auto-revoke whitelist permission flags with appop" into rvc-dev 2020-03-10 02:53:51 +00:00
Automerger Merge Worker
a55e09410e Merge "Merge "More CTS for APIs used by Mainline." into rvc-dev am: 469263a457 am: cdac1f3854" into rvc-d1-dev-plus-aosp am: e2a6e48ee5 am: dbcb04010b
Change-Id: Ia481c61683c8234b68ae97b264eefb8bbc479750
2020-03-09 23:21:22 +00:00