Commit Graph

9178 Commits

Author SHA1 Message Date
Automerger Merge Worker
ebd01a9bd2 Merge "Add a new test API for getting the list of approved rule providers." into rvc-dev am: 74739ff81b am: 2995e71682 am: b4f850e5ef am: b07b772709
Change-Id: If491a8dd91d1d364c27a80fbf4875283c0478ae6
2020-03-16 13:55:33 +00:00
TreeHugger Robot
74739ff81b Merge "Add a new test API for getting the list of approved rule providers." into rvc-dev 2020-03-16 12:35:42 +00:00
Automerger Merge Worker
77a1268bf0 Merge "Introduce per-app API for installer whitelisting" into rvc-dev am: 41b448e39b am: 013e789208 am: c48dce6001 am: f825f8dfc9
Change-Id: Id1b269b8e2d6e9708d19a13f700378f038284ca8
2020-03-14 06:42:49 +00:00
Eugene Susla
41b448e39b Merge "Introduce per-app API for installer whitelisting" into rvc-dev 2020-03-14 05:43:11 +00:00
Eugene Susla
922cd08f62 Introduce per-app API for installer whitelisting
Test: presubmit
Bug: 146513245
Change-Id: I5a4502aeb78d2e35209ed88312d24bcafbb4ba7c
2020-03-13 22:09:22 -07:00
Automerger Merge Worker
2aedb9dc00 Merge "camera2: rename getConcurrentStreamingCameraIds() -> getConcurrentCameraIds()" into rvc-dev am: 6241aceae8 am: 2a84b5265d am: 6b6991c093 am: 460ff1fb2f
Change-Id: Ic7e77e0a067a6d98dbc847f87b4b3b53bddfde07
2020-03-14 02:35:58 +00:00
Automerger Merge Worker
c3fc5571cb Merge "Treat MODE_FOREGROUND as ALLOWED for appop checks" into rvc-dev am: c670246edb am: 2fbdb1b4fc am: 1a9ebdd9af am: 5d40fd2392
Change-Id: I9e8ed47e10be2871dd95a36c13583822ba7e91cb
2020-03-14 02:34:29 +00:00
Jayant Chowdhary
6241aceae8 Merge "camera2: rename getConcurrentStreamingCameraIds() -> getConcurrentCameraIds()" into rvc-dev 2020-03-14 01:44:50 +00:00
TreeHugger Robot
c670246edb Merge "Treat MODE_FOREGROUND as ALLOWED for appop checks" into rvc-dev 2020-03-14 01:34:04 +00:00
Philip P. Moltmann
e6c5650e88 Treat MODE_FOREGROUND as ALLOWED for appop checks
noteOp always resolved MODE_FOREGROUND into IGNORED/ALLOWED
checkOp resolves it too, but checkOpRaw does not resolved it and might
return it.

Preflight checks should be independant of the uid state, hence treat
MODE_FOREGROUND similar to ALLOWED as MODE_FOREGROUND might allow it.

Bug: 150508177
Fixes: 148197098
Test: TH
Change-Id: I7b4f53c7ce638f92747d452f2d2f72d098e94b78
2020-03-14 01:22:55 +00:00
Automerger Merge Worker
27d05a28b0 Add public API to check if current app is auto-revoke exempt am: 2ac02b0d3e am: a981a1ea8f am: 97894025f7 am: 796e23392f
Change-Id: I0bacf01e59b893ca561fe30f39df16b32b2b76b0
2020-03-13 23:43:48 +00:00
Automerger Merge Worker
25b986345f Merge "Introduce per-app manifest flags for autoRevoke" into rvc-dev am: ff17a587a8 am: 562f9120d4 am: 91b0359c49 am: 519938c97b
Change-Id: If46d70a6a4e35deb4c5b0409aaad87f08c5603ef
2020-03-13 23:43:30 +00:00
Eugene Susla
2ac02b0d3e Add public API to check if current app is auto-revoke exempt
Test: presubmit
Bug: 146513245
Change-Id: I18ac5957eb9ae1ea0d7de2daf407e6d797079937
2020-03-13 22:44:00 +00:00
Eugene Susla
ff17a587a8 Merge "Introduce per-app manifest flags for autoRevoke" into rvc-dev 2020-03-13 22:40:36 +00:00
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
Eugene Susla
db77bc14de Introduce per-app manifest flags for autoRevoke
This introduces extra attributes on <application/> tag corresponding to
requesting to be shown in UI for the user to disable auto-revoke
(allowDontAutoRevokePermissions)
and being whitelisted by the installer (dontAutoRevokePermissions)

Test: presubmit
Bug: 146513245
Change-Id: I07902632812b70ea418a667d343b74d7ae170bb9
2020-03-13 11:23:26 -07: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
Song Pan
4d37486cef Add a new test API for getting the list of approved rule providers.
This allows us to check the list in GTS tests.

Bug: 145674131
Test: atest AppIntegrityManagerServiceImplTest
Change-Id: I3cb9c8379061b4a57bc6ae714b2a29204d34fa0f
2020-03-13 10:49:45 +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
Jayant Chowdhary
44bc7d8c23 camera2: rename getConcurrentStreamingCameraIds() -> getConcurrentCameraIds()
Bug: 150896133

Test: builds
Test: atest ConcurrentCameraTest.java

Change-Id: I0634358ed2591448d2f69be329a524fe1a197813
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-03-12 13:20:48 -07: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