Commit Graph

9517 Commits

Author SHA1 Message Date
Ryan Mitchell
13405917a6 Merge changes from topic "oms-transactional-api" am: b9ba6a8d0f am: f50bf40b9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1236071

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad26205fed43fd9082c8995e65592e89d3a64dde
2021-01-07 18:48:16 +00:00
Jeff Sharkey
82d5729a4b Merge "update owners for shortcut and launcher related files" am: 6173852165 am: 8d21688681
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0d9564ead4ed0f689cfbbc8e80425d4a8447500
2021-01-07 17:35:45 +00:00
Ryan Mitchell
b9ba6a8d0f Merge changes from topic "oms-transactional-api"
* changes:
  OMS: add tests for the OMS transactional API
  Push OverlayDeviceTests onto /system
  OMS: add transactional API
  OMS: block until settings are persisted
  OMS: replace OMSImpl.OverlayChangeListener with return values
  OverlayDeviceTests: add missing TEST_MAPPING
2021-01-07 15:48:20 +00:00
Jeff Sharkey
6173852165 Merge "update owners for shortcut and launcher related files" 2021-01-07 14:50:03 +00:00
Mathew Inwood
f1f8f956c6 Merge "Derestrict ContextWrapper.createApplicationContext." am: 6e1f2d209b am: 4b46fb6b09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541664

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If11ea65e77e954293a8474a32ef09ad09a8fb63e
2021-01-07 11:47:46 +00:00
Mathew Inwood
37c7d893b1 Merge "Derestrict Resources.getDisplayAdjustments()." am: ea01ff86d0 am: e48c5194db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idebdb5ee7a25eabc83e7d9486384bfc4877c90fa
2021-01-07 10:51:25 +00:00
Mathew Inwood
6e1f2d209b Merge "Derestrict ContextWrapper.createApplicationContext." 2021-01-07 10:19:23 +00:00
Mathew Inwood
4224dc8b99 Derestrict ContextWrapper.createApplicationContext.
Usage has been discovered by an app so reverting this to its previous
state. This is conceptually a partial revert of change 5d123b6775.

NoNonSdkCheck: b/170729553

Bug: 175981568
Test: m
Change-Id: I3e61d3f56f176d573f68ba85f3b1762686aa62ef
2021-01-07 09:51:37 +00:00
Mathew Inwood
ea01ff86d0 Merge "Derestrict Resources.getDisplayAdjustments()." 2021-01-07 09:47:22 +00:00
Treehugger Robot
0932dc2c83 Merge "configure owners for shortcut related tests" am: 40e2fb68e6 am: 09c41ee5dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b26283bc79a09467047932b76c21cb47627df97
2021-01-07 02:04:20 +00:00
Pinyao Ting
a4d472d23b update owners for shortcut and launcher related files
Bug: 151359749
Test: manual
Change-Id: I7e670f2c59a61ffaa341bb267133c2441206a686
2021-01-06 17:08:46 -08:00
Pinyao Ting
01c021dbe3 configure owners for shortcut related tests
Bug: 151359749
Test: manual
Change-Id: I9893b86091cf480a2cd2ba6d276a3779d02b6eb5
2021-01-06 13:47:33 -08:00
Mathew Inwood
d9770ab9a9 Derestrict Resources.getDisplayAdjustments().
Usage has been discovered by an app so reverting this to its previous
state. This is conceptually a partial revert of change 5d123b6775.

NoNonSdkCheck: b/170729553

Bug: 176190631
Test: Treehugger
Change-Id: I35a853360231a17aa95c4816de308c85d040ad40
2021-01-06 16:29:42 +00:00
Mårten Kongstad
ac6bbdb6b0 OMS: add transactional API
Implement a transactional API for the OMS. This allows a caller to batch
together individual operations, and apply those operations atomically:
either they all succeed (and notifications are sent out accordingly), or
some operation fails (and the transaction is cancelled, any internal
changes are rolled back, and no notifications are sent out).

As an added bonus, batching OMS operations result in fewer requests to
the system to refresh affected packages.

This commit adds support for transactions but leaves the old one-shot
API intact. The old API should be considered deprecated and will be
removed at some point in the future.

Note: the old API provided both setEnabled and setHighestPriority as
separate calls. In the transactional API, setEnabled implies
setHighestPriority.

Also, refactor the methods to broadcast ACTION_OVERLAY_CHANGED and to
reach out to the package and activity managers. The methods no longer
call each other: instead, it is up to the caller to explicitly invoke
each method.

Bug: 119916381
Test: builds
Change-Id: I63df58510efbc5f7a7d3146a122c3d6209e7478b
2020-12-28 13:11:18 -08:00
Alex Kershaw
2e6c54c293 DO NOT MERGE Correctly reset cross-profile app-op am: f764d9e98f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13236705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea45f7508d51a3a2f2a7be513549b2d8d34e1bb9
2020-12-17 17:22:22 +00:00
Alastair Donaldson
cff7cd0d21 Merge "Add GLES dEQP level feature flag" am: bdb4677dc4 am: 37f7971dfd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibeeb17f80cf83291845aee52c00b1c9b3b6e3428
2020-12-17 16:52:58 +00:00
Alastair Donaldson
bdb4677dc4 Merge "Add GLES dEQP level feature flag" 2020-12-17 16:06:40 +00:00
Alex Kershaw
f764d9e98f DO NOT MERGE Correctly reset cross-profile app-op
Delegate the resetting of the INTERACT_ACROSS_PROFILES app-op to
DevicePolicyManager, which knows whether it should be pre-granted and
knows to apply it equally across all users in the profile group.

Further unit tests for DevicePolicyManagerInternal will be added in
b/175440570 when we have the better infra for that.

The CrossProfileAppsServiceImpl changes look more complex than they are.
They consist of the following:
- Inclusive language changes to 'allowlist'
- Static imports of permissions to improve readability
- Previously, the setInteractAcrossProfilesAppOp method would set the
app-op for every user within the profile group of the 'calling user'.
However, given that we are now exposing this as a server-side internal
API where we need to pass in a user ID (from AppOpsService), we don't
necessarily have the guarantee that the 'calling user' is in the same
profile group. So we split it up: the client-side API and AIDL API still
set the app-op for the calling profile group, whereas the internal API
sets the app-op for every user within the profile group of the provided
user. The changes simply abstract away references to the 'calling user
ID'.

Fixes: 166561076
Bug: 175440570
Test: atest services/robotests/src/com/android/server/pm/CrossProfileAppsServiceImplRoboTest.java --verbose -c
Test: manual
Change-Id: I2181fe66022aaf6c3e6d784c0569d2f41ab66537
(cherry picked from commit d004f41188)
2020-12-17 13:27:34 +00:00
Alastair Donaldson
ee0bd40932 Add GLES dEQP level feature flag
This change adds a feature flag that specifies the date associated
with the OpenGL ES dEQP tests that a device claims to pass.

Bug: 159842117
Merged-In: I830fbfcff617c891a42ca46396adf0283a52b874
Change-Id: I29dddc28c18933f4fa338a2aaa87d4c748deafa3
2020-12-17 13:00:06 +00:00
Treehugger Robot
78a110c211 Merge "Replace Locale#adjustLanguageCode with its own implementation" am: 81546d66ad am: b03a4e6fff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531680

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ca948bdb0c688b53f8808f7c948aa1b5363fbab
2020-12-17 11:10:57 +00:00
Treehugger Robot
ccd634ec0c Merge "Make a copy of libcore.util.ArraysUtils in framework" am: f35963cb77 am: acd5ae1807
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0232dc3e89ca638cf5097888946f7f70b3f116d1
2020-12-17 11:10:44 +00:00
Treehugger Robot
81546d66ad Merge "Replace Locale#adjustLanguageCode with its own implementation" 2020-12-17 10:32:38 +00:00
Treehugger Robot
f35963cb77 Merge "Make a copy of libcore.util.ArraysUtils in framework" 2020-12-17 10:10:52 +00:00
Paul Hu
fd71d25ea5 Merge "Update some in-procss APIs to system APIs" am: a7f149d86d am: f0b1601c66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c2cb79d321d3e5ae686cb9ba682e600df392be0
2020-12-17 03:06:57 +00:00
Victor Chang
33d2988812 Replace Locale#adjustLanguageCode with its own implementation
No known behavior change.

Bug: 154796679
Test: treehugger
Merged-In: I474ad621b84da9f7cc7961def6d6751925577d41
Change-Id: I474ad621b84da9f7cc7961def6d6751925577d41
2020-12-17 00:15:29 +00:00
Victor Chang
37c6b6deeb Make a copy of libcore.util.ArraysUtils in framework
It helps remove it from the @CorePlatformApi

Bug: 154796679
Test: ArrayUtilsTest
Merged-In: I0c8f194a74a16b2cc46f9eea4571d5fb674fbc28
Change-Id: I0c8f194a74a16b2cc46f9eea4571d5fb674fbc28
2020-12-17 00:07:23 +00:00
paulhu
32164bb807 Update some in-procss APIs to system APIs
In-process API only applies to code in frameworks/base/services
so that CS mainline can't use these APIs. Thus, update these
in-process APIs to system APIs to support CS mainline usage.

Bug: 170593746
Test: atest FrameworksNetTests
Change-Id: I4c7c1e71dcb6448aed0107768b4ba8eecd3e11f7
2020-12-16 19:21:14 +08:00
Mårten Kongstad
28b23286d5 idmap2: remove the 'scan' command am: 6532483950 am: 29e7a4394a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519907

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04d797b558efe44e763b96b01dc4870e7cc4960b
2020-12-14 22:24:51 +00:00
Mårten Kongstad
29e7a4394a idmap2: remove the 'scan' command am: 6532483950
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519907

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If62d07750556e734686a0c1df2f2e533b83c1b1c
2020-12-14 21:20:53 +00:00
Ryan Mitchell
314863c132 Merge changes from topic "inc-hard-am"
* changes:
  Revert^2 "Cache resolved theme values"
  Set resource id correctly when resolve fails
  Revert^2 "libandroidfw hardening for IncFs"
  idmap2: remove call to obsolete 'idmap2 verify' from valgrind.sh
  idmap2: remove the 'scan' command
2020-12-14 20:42:03 +00:00
Wale Ogunwale
926aa8da2c Merge "Add more OWNERS coverages" am: 32ff0144bf am: 60f676c7d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519794

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32e5f8566ba916c892898f3f521a5a4309646142
2020-12-11 16:58:45 +00:00
Charles Chen
09f4e85ac2 Add more OWNERS coverages
Test: manual
Bug: 174932174
Change-Id: Ia798bdbce8516a3d675c55028ab637ad7f0695cf
2020-12-11 19:16:38 +08:00
Jeff Sharkey
e6d38e61cc Merge "configure owners for ShortcutInfo" am: 694df14654 am: 2948fb99c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520446

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27c7ab6c7a1325b43857e1456e631c044ac0d3b5
2020-12-10 22:39:20 +00:00
Jeff Sharkey
694df14654 Merge "configure owners for ShortcutInfo" 2020-12-10 21:36:20 +00:00
Pinyao Ting
5df24bca42 configure owners for ShortcutInfo
Bug: 151359749
Test: manual
Change-Id: Ic3f338083402f2c189f36b8ec9db502e11e50a55
2020-12-10 13:13:26 -08:00
Chris Wailes
2a6f9b05a3 Adds an "install scenario" field to the appropriate datastructures am: d42204a865 am: e2c2f7ec15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb120d7fd34ab55c2d01978f01a6ab474d6a5664
2020-12-09 02:23:45 +00:00
Chris Wailes
e2c2f7ec15 Adds an "install scenario" field to the appropriate datastructures am: d42204a865
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifeb0c921ec079202dba5b0b50eb147b09ea3042e
2020-12-09 01:22:52 +00:00
Christian Wailes
21b065b610 Merge changes from topic "install-hints"
* changes:
  Modify dexopt invocation based on install scenario
  Adds an "install scenario" field to the appropriate datastructures
2020-12-09 00:00:26 +00:00
Mårten Kongstad
6532483950 idmap2: remove the 'scan' command
The 'scan' command has been replaced by 'create-multiple'. Remove the
unused code.

Also remove unused functions and #includes from FileUtils, and the
obsolete JNI plumbing.

Test: atest idmap2_tests OverlayDeviceTests OverlayHostTests
Change-Id: Iae073c13ce64b5db48f22f7e723bc8c0c5fcd2c9
Merged-In: Iae073c13ce64b5db48f22f7e723bc8c0c5fcd2c9
2020-12-08 16:54:51 +00:00
Jeff Sharkey
24d251403b Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c am: c7c4a74a78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5120a3701af3564f363900b20bca75f3ad2a854c
2020-12-08 16:43:17 +00:00
Jeff Sharkey
c7c4a74a78 Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0211462ecbcd9ad66f66af87e31cf12e1582fc65
2020-12-08 16:01:16 +00:00
Jeff Sharkey
fab0ab3c9c Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script from
detailed ownership information confirmed by team leads.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I9789c97c1de8e5d962b48c29c57d82fe83729eba
Change-Id: I9789c97c1de8e5d962b48c29c57d82fe83729eba
2020-12-08 08:36:27 -07:00
Chris Wailes
d42204a865 Adds an "install scenario" field to the appropriate datastructures
This CL adds an "install scenario" field to several data structures used
by the Package Manager.  This value will be used by a following CL to
adjust the invocation of dexopt based on the indicated use case.

Bug: 173137187
Test: build
Merged-In: I1d0df8edf85a598905a5e7509f6c811df5c20e2e
Change-Id: I1d0df8edf85a598905a5e7509f6c811df5c20e2e
2020-12-07 15:05:54 -08:00
Brian Stack
c57e2123d4 Expose UwbManager through Context.getSystemService am: 3163bf0d35 am: 2557747c4d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504101

Change-Id: I5213f04b2bf1f0db39a872ab7dd7f0d45fd60103
2020-12-04 18:00:40 +00:00
Brian Stack
2557747c4d Expose UwbManager through Context.getSystemService am: 3163bf0d35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504101

Change-Id: I14aa423224f37447024ddb4cc67cabe06d60a30a
2020-12-04 17:39:49 +00:00
TreeHugger Robot
73d6176569 Merge "Update CPA startActivity javadoc to refer to passing the result back" into rvc-qpr-dev am: e9fd7678bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144034

Change-Id: I8c8dc5cb9910c977169d220d5ece84a2403ccade
2020-12-04 14:05:18 +00:00
TreeHugger Robot
e9fd7678bf Merge "Update CPA startActivity javadoc to refer to passing the result back" into rvc-qpr-dev 2020-12-04 13:39:26 +00:00
Brian Stack
3163bf0d35 Expose UwbManager through Context.getSystemService
Bug: 170323306
Test: atest UwbManagerTests
Change-Id: I04c1263a191fcfeee5824be5d6d1944354819d02
Merged-In: I04c1263a191fcfeee5824be5d6d1944354819d02
2020-12-02 13:58:28 -08:00
Kevin Hufnagle
786e3d0906 Merge "docs: Mention app query filters on Android 11" into rvc-dev am: ace19f5537 am: 6030f5b0cb am: fe2da4e99b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13113598

Change-Id: I6455816bb0bdd5fc34b00a3bc8dd9974c1d3a718
2020-12-02 20:10:16 +00:00
Kevin Hufnagle
fe2da4e99b Merge "docs: Mention app query filters on Android 11" into rvc-dev am: ace19f5537 am: 6030f5b0cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13113598

Change-Id: I14c6ed59a8dbf90170424abe2738a568c7fe672a
2020-12-02 19:00:53 +00:00