Commit Graph

10060 Commits

Author SHA1 Message Date
Julia Reynolds
071f0a46fc Add a status API for conversations
Status are transient pices of information about the current
activities or availability of someone in a conversation. They
may be shown in places where conversations are shown.

Test: atest, cts
Bug: 163617224
Change-Id: I4b61bc3b7f338e9c8cae2c6142622a7040547ddb
2021-01-11 10:15:08 -05:00
Ryan Mitchell
597cb08904 Merge changes from topic "oms-transactional-api" am: b9ba6a8d0f am: f50bf40b9b am: 13405917a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1236071

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c9be5b9bd85ea9a54b06b1b39a8d89e8d96206c
2021-01-07 19:21:04 +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
7bdb59ff90 Merge "update owners for shortcut and launcher related files" am: 6173852165 am: 8d21688681 am: 82d5729a4b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9489078072612dcc541de5acf570eb22519042b0
2021-01-07 17:53:22 +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
55350450fb Merge "Derestrict ContextWrapper.createApplicationContext." am: 6e1f2d209b am: 4b46fb6b09 am: f1f8f956c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541664

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If47397df98ebb90c079d110fbfd947aa17abe05b
2021-01-07 12:26:58 +00:00
TreeHugger Robot
db806b58cf Merge "Add a UI Context for RootTaskDisplayAreaOrganizer" 2021-01-07 11:58:04 +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
46a446f45e Merge "Derestrict Resources.getDisplayAdjustments()." am: ea01ff86d0 am: e48c5194db am: 37c7d893b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic62efe2198ec8b30b509aed5821b13822f81273f
2021-01-07 11:12:18 +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
Charles Chen
74e1d37cad Add a UI Context for RootTaskDisplayAreaOrganizer
Bug: 175416931
Test: atest SplitScreenTests WMShellUnitTests

Change-Id: Id11bfef19076840e46222014e268a553bd94f2ef
2021-01-07 17:09:32 +08:00
Treehugger Robot
ceeb28518f Merge "configure owners for shortcut related tests" am: 40e2fb68e6 am: 09c41ee5dd am: 0932dc2c83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddf5a8d53b4d77dbfb440dbf10ec7ba8ce566918
2021-01-07 02:17:52 +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
Mehdi Alizadeh
3ef6970d1a Merge "Adds RequiresPermission on ShortcutQuery#FLAG_GET_PERSON_DATA" 2021-01-06 21:09:24 +00: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
Benjamin Franz
f8983589ac Merge "Per-app configuration for force resizing" 2021-01-06 10:24:36 +00:00
TreeHugger Robot
0062ecbe31 Merge "Add attributions to PackageInfo" 2021-01-06 00:18:10 +00:00
Benjamin Franz
06bb87d8fe Per-app configuration for force resizing
We're defining a new compat framework change id that indicates whether a
given app should be force resized. This is treated the same as
supportsSizeChanges metadata.

Bug: 174042936
Test: atest WmTests:SizeCompatTests
Change-Id: I6ef3ec11171140ca5a244f2185a3710d9fec7ae9
2021-01-05 15:18:33 +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
Mehdi Alizadeh
af42e0f676 Adds RequiresPermission on ShortcutQuery#FLAG_GET_PERSON_DATA
Bug: 174761872
Test: Passes pre-submit
Change-Id: I192061a340bbed136f65261fe9e8c6ed37e153c1
2020-12-22 20:35:33 +00:00
Charles Chen
465c67dfd5 Merge "Introduce #createWindowContext with display" 2020-12-22 09:44:53 +00:00
Charles Chen
b63b92922b Introduce #createWindowContext with display
Test: atest ContextIsUiContextTest ContextGetDisplayTest
Test: atest WindowContextPolicyTests
Bug: 174640742
Change-Id: I13bd07fa3a4e79fe44bce34157ee93622cbb431d
2020-12-21 15:01:48 +08:00
TreeHugger Robot
69f35b55c2 Merge "Migrate ApkAssets to use NativeAllocationRegistry" 2020-12-21 05:15:37 +00:00
Ryan Mitchell
1e2456730d Migrate ApkAssets to use NativeAllocationRegistry
This change ensures that mNativePtr can be deleted only when its
ApkAssets is really inaccessible and prevents finalization race
conditions.

Bug: 159041693
Test: boot and add logs to ensure destructor runs
Change-Id: Iff0612fe6862a17b8c889d9e7ba230094e3cb14a
2020-12-17 20:47:38 +00: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
Nick Moukhine
47bb18859c Merge "Add shell commands MusicRecognitionService" 2020-12-17 08:40:51 +00:00
Paul Hu
c3238cc763 Merge "Update some in-procss APIs to system APIs" am: a7f149d86d am: f0b1601c66 am: fd71d25ea5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65e2d9353b34f762c24ccbd1d7879379833642b1
2020-12-17 05:16:02 +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
63c5fe5d33 Merge "Make a copy of libcore.util.ArraysUtils in framework" 2020-12-17 02:25:00 +00:00
TreeHugger Robot
5b90227078 Merge "Replace Locale#adjustLanguageCode with its own implementation" 2020-12-17 01:06:39 +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
Victor Chang
198ced861a Make a copy of libcore.util.ArraysUtils in framework
It helps remove it from the @CorePlatformApi

Bug: 154796679
Test: ArrayUtilsTest
Change-Id: I0c8f194a74a16b2cc46f9eea4571d5fb674fbc28
2020-12-16 23:50:30 +00:00
Kholoud Mohamed
41b4477a53 Merge "Correctly reset cross-profile app-op" 2020-12-16 21:22:46 +00:00
Victor Chang
8daac22971 Replace Locale#adjustLanguageCode with its own implementation
No known behavior change.

Bug: 154796679
Test: treehugger
Change-Id: I474ad621b84da9f7cc7961def6d6751925577d41
2020-12-16 19:53:23 +00:00