Commit Graph

105804 Commits

Author SHA1 Message Date
Louis Chang
37fe59a2fe Merge "Do not always report configuration change to activity" into rvc-dev am: e500c6773b
Change-Id: I51d3dbb3f0805e7e0afa2edac88ae10fda9f6ea9
2020-05-27 04:18:07 +00:00
Louis Chang
e500c6773b Merge "Do not always report configuration change to activity" into rvc-dev 2020-05-27 04:17:14 +00:00
Alex Buynytskyy
53ea003df2 Merge "Lifecycle: detecting blocked and unhealthy." into rvc-dev am: 4e5ff2eb7d
Change-Id: If0f24b8549fbf78aecf4586551528606064ecfe7
2020-05-27 04:17:10 +00:00
Alex Buynytskyy
4e5ff2eb7d Merge "Lifecycle: detecting blocked and unhealthy." into rvc-dev 2020-05-27 04:15:54 +00:00
Zach Johnson
1eec532a8e Add NAMESPACE_BLUETOOTH for bluetooth feature experiments
Exempt-From-Owner-Approval: exact cherry-pick from already approved master CL.
Test: compile
Bug: 156757711
Merged-In: I330b8cc5aeb14ebcc15fb88c605ac72770497040
Change-Id: I330b8cc5aeb14ebcc15fb88c605ac72770497040
(cherry picked from commit 9b9235981c)
2020-05-27 02:01:21 +00:00
TreeHugger Robot
74025318fe Merge "Camera: Extend FEATURE_CAMERA_CONCURRENT to old API levels" into rvc-dev am: 80a18c0a7b
Change-Id: I890fe7ea908101c5118829231c0ead7e24fa3918
2020-05-27 00:56:32 +00:00
TreeHugger Robot
80a18c0a7b Merge "Camera: Extend FEATURE_CAMERA_CONCURRENT to old API levels" into rvc-dev 2020-05-27 00:45:04 +00:00
Sarah Chin
8fde1df057 Merge "Add Setting for NR screen off indications" into rvc-dev am: 8300a64490
Change-Id: Id94543e228ff6693045e102a74f728c7b22975da
2020-05-26 22:02:50 +00:00
Sarah Chin
8300a64490 Merge "Add Setting for NR screen off indications" into rvc-dev 2020-05-26 21:56:42 +00:00
TreeHugger Robot
e9b6fa5da6 Merge "WindowlessWindowManager: Set size when creating surface" into rvc-dev am: 58c7846f6a
Change-Id: Id975b3b7206fa1abbabbcb9f54718726d45dbb65
2020-05-26 20:51:04 +00:00
TreeHugger Robot
58c7846f6a Merge "WindowlessWindowManager: Set size when creating surface" into rvc-dev 2020-05-26 20:41:22 +00:00
Alex Buynytskyy
8ef61aebee Lifecycle: detecting blocked and unhealthy.
Part 1: interfaces and PM implementation.

Bug: 153874006
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: I312dd919d2bb552bea3d72fb49fd1579882da14b
2020-05-26 19:34:39 +00:00
Robert Carr
5d9d2ddca2 WindowlessWindowManager: Set size when creating surface
When we set the buffer size from relayout window, there is a race
condition where the client may then submit its first buffer but the
transaction hasnt applied yet on the SF side and so the buffer is
rejected. Setting a defualt size when creating fixes this. Luckily
SurfaceControlViewHost size is known at add time, since we force the
window size based on the values passed in to the SurfaceControlViewHost API.

Bug: 157153874
Test: Existing tests pass
Change-Id: I2566844aea81df92f1694f43254a480fc3b3c019
2020-05-26 11:29:39 -07:00
Collin Fijalkovich
d47bed436d Merge "Cache isUserUnlockingOrUnlocked Binder calls" into rvc-dev am: adfe0e9193
Change-Id: Ia4488c0150fc811bbd476d275b6c8f5adec792da
2020-05-26 17:57:15 +00:00
Collin Fijalkovich
adfe0e9193 Merge "Cache isUserUnlockingOrUnlocked Binder calls" into rvc-dev 2020-05-26 17:49:51 +00:00
Michael Groover
a548a2ebce Merge "Address edge cases for signing certificate lineages in sharedUids" into rvc-dev am: 2046776127
Change-Id: I500c6b25f855c6772bf7775f3995647cbecaa0f9
2020-05-26 16:21:07 +00:00
Michael Groover
2046776127 Merge "Address edge cases for signing certificate lineages in sharedUids" into rvc-dev 2020-05-26 16:07:57 +00:00
Neil Fuller
29867f046d Merge "Be more defensive around invalid tzids" am: f60c302dad am: 96c57398b4
Change-Id: If8695ee257155eaedc901aa797f1939eab0c721e
2020-05-26 10:54:50 +00:00
Neil Fuller
96c57398b4 Merge "Be more defensive around invalid tzids" am: f60c302dad
Change-Id: I08e1daaf9dd0a26017b18c984eb6d4093c46ed46
2020-05-26 10:36:28 +00:00
Neil Fuller
f60c302dad Merge "Be more defensive around invalid tzids" 2020-05-26 10:20:09 +00:00
Neil Fuller
26fe60a188 Be more defensive around invalid tzids
Add checks during boot in case the persist.sys.timezone property is set
to a bad ID.

This can happen in the rare case of a mainline rollback: i.e. if a device has
been set to a new ID and then the update is rolled back. Using GMT as a
fallback probably works without this change (it does in java.util.TimeZone),
but relies on all code, including native code that uses
persist.sys.timezone directly, knowing to interpret a bad ID as "GMT".
This commit makes that choice more explicit and defensive.

This change also removes the possibility of IOException, which is never
thrown, from some ZoneInfoDb methods.

Bug: 155738410
Test: boot with a valid id, verify persist.sys.timezone is unchanged
Test: boot with an invalid id set,  verify persist.sys.timezone is "GMT"
Merged-In: I6dc0f4f81848efbbaec6a11a62014471a0ef01fd
Change-Id: I6dc0f4f81848efbbaec6a11a62014471a0ef01fd
Exempt-From-Owner-Approval: Approved / landed internally
2020-05-26 10:19:53 +00:00
Stanislav Zholnin
dc84372155 Merge "Remove UidAtomTests from presubmit due to failures." into rvc-dev am: c1846a1a65
Change-Id: Ic55f54c525d0aa21ed01ac9ea3fe9776ea47c663
2020-05-25 19:51:02 +00:00
Stanislav Zholnin
86b0b984cf Remove UidAtomTests from presubmit due to failures.
Test: manual

Bug: 155714228
Change-Id: I661c6503c387a00803bb949e3e8ca431045dd266
2020-05-25 19:01:34 +00:00
Anton Hansson
78b956deb1 Merge "Remove nullablility annotations from module-lib" into rvc-dev 2020-05-25 12:09:26 +00:00
Anton Hansson
4134b2c2c8 Merge "Remove nullablility annotations from module-lib" into rvc-dev-plus-aosp 2020-05-25 09:54:47 +00:00
TreeHugger Robot
1c0a902b50 Merge "Remove feature flag, unused lib and test cases" into rvc-dev am: c34c144c6b
Change-Id: I7b11c6a44187a47e8fd6d2c8ceb78ae979e392f1
2020-05-25 09:14:45 +00:00
TreeHugger Robot
c34c144c6b Merge "Remove feature flag, unused lib and test cases" into rvc-dev 2020-05-25 09:07:24 +00:00
Sunny Shao
ffc352b9f9 Remove feature flag, unused lib and test cases
Fixes: 155949554
Test: make RunSettingsLibRoboTests -j56
Change-Id: I54a31aed503f7f058887720ab4fe01ca2f39ff93
2020-05-25 13:38:54 +08:00
easoncylee
6043c366b5 Fix mis-configuration of TEST_MAPPING file. am: 3e213cffec
Change-Id: I59f141c2b95e29a69a4b0f19436349340e8417b2
2020-05-24 23:35:01 +00:00
easoncylee
3e213cffec Fix mis-configuration of TEST_MAPPING file.
UidAtomTests:testAppOps is a test class and test method of
CtsStatsdHostTestCases. To run this in Test Mapping, it should
specify CtsStatsdHostTestCases. as the name in TEST_MAPPING file,
and android.cts.statsd.atom.UidAtomTests as the options.

Bug: 155714228
Test: presubmit test.
Change-Id: I7df08ae811425020ebbeae6a8e9f1317065c00c9
2020-05-24 21:32:51 +00:00
Michael Groover
f1744af7ed Address edge cases for signing certificate lineages in sharedUids
Currently when a package is installed / updated in a sharedUid the
signatures for the sharedUid are not updated unless the new package
adds a new signer to the lineage; in this case the new lineage is
assigned to the sharedUid without consideration for the existing
lineage. This leads to the following problems:

1. If the current sharedUid lineage is A -> B and the new package has
lineage B -> C then this is used for the sharedUid and A is lost from
the lineage.
2. If the new lineage revokes one or more capabilities from a previous
signer in the lineage these updated capabilities are ignored unless the
lineage added a new signer as well.
3. If the new lineage revokes the sharedUid capability from a previous
signing key in the lineage and another app is installed as part of the
sharedUid and signed with that key the new app's installation is allowed
to proceed.
4. If only a single app is installed as part of a sharedUid, and that
app is updated with a rotated key and a lineage that revokes the
previous signing key's sharedUid capability the update is blocked.
5. If an app is installed as part of the sharedUid and has a diverged
signer in the lineage (ie sharedUid lineage is Y -> A -> B and new app
lineage is Z -> A -> B -> C) the installation is allowed and Y is lost
from the lineage.

Problems 1 and 2 are addressed with the new SigningDetails
mergeLineageWith method that merges common signers between two lineages
and also updates their capabilities to the most restrictive between
the two lineages (capabilities are anded together). Problems 3 is
addressed by checking the signatures of each of the packages in the
sharedUid for any signed with an ancestor for which the sharedUid
capability may have been revoked. Problem 4 is addressed by checking
if the package being updated is the only one in the sharedUid; if so
the update to the new lineage is allowed to proceed. Problem 5 is
addressed by verifying the new app's lineage is the same, a subset, or
a superset of the other.

Bug: 152046935
Test: atest PkgInstallSignatureVerificationTest
Test: atest SigningDetailsTest
Test: atest PackageManagerTests
Test: atest PackageManagerTest
Change-Id: I420c309f522bb47b65ca40ee848024c85cd5804d
2020-05-22 23:50:52 +00:00
Cody Kesting
a4b2c9a62f Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: 54d9df0f04 am: 3e0895155f
Change-Id: I31d17c5c353e822f3d48166ffe9cc39abd31c198
2020-05-21 23:35:38 +00:00
Cody Kesting
3e0895155f Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: 54d9df0f04
Change-Id: Ifc49eb81c219d1ba036c11887e2bc686a68dd67d
2020-05-21 23:19:30 +00:00
Adam Bookatz
9dd510e1e9 Merge "UserRestriction doc fix: primary -> admin" into rvc-dev am: 535e4abdd2
Change-Id: I084ce0b6837db8216941e3e9cecf94fa6450535f
2020-05-21 23:00:33 +00:00
Cody Kesting
54d9df0f04 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." 2020-05-21 22:58:29 +00:00
Adam Bookatz
535e4abdd2 Merge "UserRestriction doc fix: primary -> admin" into rvc-dev 2020-05-21 22:44:53 +00:00
Eugene Susla
48cdc8ef57 Merge "Correct javadoc for an auto-revoke API" into rvc-dev am: 3f24b9cf64
Change-Id: I4087ac882ffb78228092931d0974561ed6ca6c1e
2020-05-21 21:28:35 +00:00
Eugene Susla
3f24b9cf64 Merge "Correct javadoc for an auto-revoke API" into rvc-dev 2020-05-21 21:07:30 +00:00
TreeHugger Robot
6b5d92135a Merge "Don't truncate an app's own label when forcing safe label." into rvc-dev am: 2f988b5a82
Change-Id: Iedc22c9b70835ee992c38976ff1dcacf634850ed
2020-05-21 19:27:14 +00:00
Julia Reynolds
a4eebac4e4 Merge "Update conversation labels" into rvc-dev am: 28c3a34faa
Change-Id: I9b1715deb958d5bf72ee173e46575f4a2788af1a
2020-05-21 19:17:25 +00:00
TreeHugger Robot
2f988b5a82 Merge "Don't truncate an app's own label when forcing safe label." into rvc-dev 2020-05-21 19:06:51 +00:00
Julia Reynolds
28c3a34faa Merge "Update conversation labels" into rvc-dev 2020-05-21 18:53:24 +00:00
Eugene Susla
44753b4c8f Correct javadoc for an auto-revoke API
Test: presubmit
Bug: 153607914
Change-Id: Ie271ecfbb3e9356080c28103df658b411ebd61ec
2020-05-21 11:03:37 -07:00
TreeHugger Robot
3fb3ffeda8 Merge "Prevent DPCs from requesting INTERACT_ACROSS_PROFILES" into rvc-dev am: 5d6cf38cd1
Change-Id: I6120224f6026d605121e00e38b18fe5fcd769d99
2020-05-21 16:27:31 +00:00
TreeHugger Robot
5d6cf38cd1 Merge "Prevent DPCs from requesting INTERACT_ACROSS_PROFILES" into rvc-dev 2020-05-21 16:25:25 +00:00
TreeHugger Robot
cde6e23dc0 Merge "Camera: Query default display size from display manager" into rvc-dev am: 4586885a63
Change-Id: Ib9b33363c36b45bbb820484a57f60c32af89b749
2020-05-21 16:21:19 +00:00
TreeHugger Robot
4586885a63 Merge "Camera: Query default display size from display manager" into rvc-dev 2020-05-21 16:12:40 +00:00
Hui Yu
0c107e3d09 Merge "Check PendingStartActivityUids list before updateOomAdj is done." into rvc-dev am: 600ce540ca
Change-Id: Ic0af8fa5f1e9bcaa9b7eeb2aba990524024f013e
2020-05-21 16:04:04 +00:00
Hui Yu
600ce540ca Merge "Check PendingStartActivityUids list before updateOomAdj is done." into rvc-dev 2020-05-21 16:00:43 +00:00
Alex Johnston
28ccaf1dfd Merge "setAutoTimeRequired disabled on managed profile" into rvc-dev am: fa6cf17648
Change-Id: Ifebf6a1e9320028b3a3ab1604a876621d35aee93
2020-05-21 10:26:57 +00:00