Commit Graph

9535 Commits

Author SHA1 Message Date
Ryan Mitchell
514b93a67b Merge changes I33358ce4,I5746ffae,Ie307ce30,I8cd5eb46,Ie02ddd37, ... am: 0b5e65b81d am: 77ad0e767c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbf5c68c939202662e62e4031f128f40c805af52
2021-01-21 19:30:27 +00:00
Mårten Kongstad
dc427169c9 Revert "Revert "OMS: add transactional API""
This reverts commit 295e0d7183.

Change-Id: I5746ffae41f3e907c39420dce433c4dc91d1145c
2021-01-21 14:33:31 +00:00
Treehugger Robot
37f4ebb9e1 Merge "Make BugreportManager a public API that respects carrier privileges." am: 0dcf4de7df am: 6d6c5ec5cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552883

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib26fe91f828ca6d39f19f7893f2f3c76da6e9738
2021-01-19 01:34:32 +00:00
Hunter Knepshield
30e7b64d9c Make BugreportManager a public API that respects carrier privileges.
This permission model is only allowed for BUGREPORT_MODE_TELEPHONY to
let carrier apps (even from the Play Store / not pre-loaded) access
BugreportManager to trigger connectivity bugreports.

This also requires SELinux policy changes to allow non-system apps to
get an instance through Context#getSystemService, and then dumpstate
also needs permissions to write public apps' files.

Minor documentation and formatting fixes as well.

BYPASS_INCLUSIVE_LANGUAGE_REASON=leaving variable name derived from
"bugreport-whitelisted" sysconfig alone for now

Bug: 161393541
Test: atest CtsCarrierApiTestCases:BugreportManagerTest
Change-Id: I5a38e7a040fa23146fa6c1e785db102b066ad167
Merged-In: I5a38e7a040fa23146fa6c1e785db102b066ad167
(cherry picked from commit 57fd3440be)
2021-01-15 17:35:45 -08:00
Jeff Sharkey
613909af31 Merge "update owners for AppSearchPerson related files" am: a1daeb7005 am: f7de146c0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2c4250a4813d9e3120cb01e96cd7f51532c52c0
2021-01-14 17:10:15 +00:00
Jeff Sharkey
a1daeb7005 Merge "update owners for AppSearchPerson related files" 2021-01-14 16:25:29 +00:00
Todd Kennedy
cceb8b5a97 Merge "add new owners for IntentFilter and Intent" am: c9e61a5c83 am: 5fcf36eefe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b89d19806bd96e3af6f8b93cb23db6faa641634
2021-01-13 20:47:21 +00:00
Pinyao Ting
e164c3223e update owners for AppSearchPerson related files
Bug: 151359749
Test: manual
Change-Id: I4ab1e9f9b8a70021f8fc7bd0fdfbab63d71fffaa
2021-01-13 11:50:59 -08:00
Todd Kennedy
c9e61a5c83 Merge "add new owners for IntentFilter and Intent" 2021-01-13 19:47:10 +00:00
Mathew Inwood
982e50f2c6 Merge "Derestrict some non-SDK APIs." am: 29bf6e8443 am: 9e27f89092
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eeffeb0d9ab509e2f436435bf2079558e2d1c7d
2021-01-13 10:12:53 +00:00
Mathew Inwood
29bf6e8443 Merge "Derestrict some non-SDK APIs." 2021-01-13 09:38:35 +00:00
Todd Kennedy
cfed1e57ae add new owners for IntentFilter and Intent
Change-Id: I08cf0635715290a3baba049a81b35bcad0eddb03
2021-01-13 03:55:25 +00:00
Treehugger Robot
c9d2ce70de Merge "Revert "OMS: add transactional API"" am: 7facc4ec41 am: ba88e64636
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d5bf83f5d5ce2600084e4c2be28199ffe78db22
2021-01-13 00:48:58 +00:00
Treehugger Robot
7facc4ec41 Merge "Revert "OMS: add transactional API"" 2021-01-13 00:00:42 +00:00
Ryan Mitchell
295e0d7183 Revert "OMS: add transactional API"
This reverts commit ac6bbdb6b0.

Reason for revert: b/177065099

Change-Id: I11d8a498f25b3e734a28f160a6b65c5b5720a38d
2021-01-12 21:09:53 +00:00
Adam Bookatz
9ac98ffa59 Merge "Add User* OWNERS file (part 2)" am: da79da08f0 am: b9b73d26db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87bc14c52e4aa4ed42f73496e104f0f3182c613b
2021-01-12 20:55:13 +00:00
Adam Bookatz
6cd4cd01fb Add User* OWNERS file (part 2)
Part 1 was aosp/1546301.
Two parts are required due to b/175318571.

Test: N/A
Change-Id: I1a89f7d26da70dce36d1e891a8e8ebc4042dc56c
2021-01-12 01:03:39 +00:00
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
95709ba69f Derestrict some non-SDK APIs.
Per request from a partner, these APIs will not be restricted as they
are in use. This is conceptually a partial revert of change 5d123b6775.

NoNonSdkCheck: b/170729553

Bug: 171933273
Test: Treehugger
Change-Id: Ibb525e9a9e2fc90248b74f45f3cdcb0be7487c3a
2021-01-07 09:53:09 +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