7138 Commits

Author SHA1 Message Date
Winson Chung
4487059e7f Merge "Also apply freeze-task-list when starting an activity" into qt-r1-dev
am: 2cc5346954

Change-Id: Id062df0c41accbf95a48f78b14e3d4512605d7f4
2019-07-29 17:17:56 -07:00
Winson Chung
a08edfaedb Merge "Also apply freeze-task-list when starting an activity" into qt-r1-dev
am: 2cc5346954

Change-Id: Ie556c0e246dffcfaa8ca8556974abde2e843883f
2019-07-29 17:16:36 -07:00
Winson Chung
c587e55a8b Merge "Also apply freeze-task-list when starting an activity" into qt-r1-dev
am: 2cc5346954

Change-Id: I775b15bd6917abe90ecfcc92cfb7a6a245412283
2019-07-29 17:14:14 -07:00
atrost
4f8c307dbf resolve merge conflicts of 56509ddb842b8770249de6d4d80a2fc7dc9c87e1 to stage-aosp-master
Bug: 138222871
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3965d41d6756a25dd44a0ed676de5ec8b5bae21
Merged-In: Id523d31e7b6d2def9371753ae34cba883cd62a54
2019-07-29 15:21:58 +01:00
Anna Trostanetski
acf538db88 Merge "Read compat config in CompatConfig class." into qt-dev-plus-aosp am: fe7c3ae8c0
am: 232fa4106c

Change-Id: If7a423ca49847f72ceb5a001cc0aabcebeaf8af3
2019-07-29 04:52:14 -07:00
Anna Trostanetski
232fa4106c Merge "Read compat config in CompatConfig class." into qt-dev-plus-aosp
am: fe7c3ae8c0

Change-Id: I0b082c757c22169f57f59fbd8d61f00c5dce3a22
2019-07-29 04:38:58 -07:00
Winson Chung
e219ae1fba Also apply freeze-task-list when starting an activity
- We previously only did this for startActivityFromRecents(), but for 3p
  launchers, we need to start the RecentsActivity mid-gesture and don't
  want to punt the excluded task from the front of the list

Bug: 137199105
Test: Install 3p Launcher, force-enable gesture nav, swipe up from
      exclude-from-recents activity

Change-Id: I7881ea103e83d28df1ec94d1874295188bed1064
2019-07-27 16:26:18 +00:00
Julia Reynolds
234c6fa65f Merge "Only log/send broadcasts for changed data" into qt-qpr1-dev
am: 866e6da515

Change-Id: I9d6106e2d2bec47ce691e15c1cdc62251471543f
2019-07-26 15:39:02 -07:00
Dan Shi
bcef6ae6bc Fix dependency on APK used by test
Use data attribute to include the APK used for the test.

Bug: 138416078
Test: atest
Change-Id: Iffeca6c5f487c6a164acb9c880a5b6405eff424d
2019-07-26 14:16:43 -07:00
Julia Reynolds
4f5020d983 Only log/send broadcasts for changed data
Test: atest
Fixes: 128834143
Change-Id: Ib85271385a1385415a00d32ed6fd41fbc7b4f245
(cherry picked from commit c4c6e9fc062a7e4fda8f2b7ae77f136c1e90ccc4)
2019-07-26 19:23:50 +00:00
atrost
7e6060f448 Read compat config in CompatConfig class.
Use the auto generated parser, and test by feeding streams of XML.

Test: atest FrameworksServicesTests
Bug: 138222871
Change-Id: Id523d31e7b6d2def9371753ae34cba883cd62a54
Merged-In: Id523d31e7b6d2def9371753ae34cba883cd62a54
2019-07-26 15:43:09 +00:00
atrost
bc0f406751 Read compat config in CompatConfig class.
Use the auto generated parser, and test by feeding streams of XML.

Test: atest FrameworksServicesTests
Bug: 138222871
Change-Id: Id523d31e7b6d2def9371753ae34cba883cd62a54
2019-07-26 16:40:25 +01:00
Sunny Goyal
f28a14489c Merge "Preventing system crash when pin slice fails" into qt-r1-dev
am: 3f7230cb93

Change-Id: Ie6760f19c4ced4350646944db52d2f4857d0d661
2019-07-25 15:38:02 -07:00
Sunny Goyal
9ed07958f4 Merge "Preventing system crash when pin slice fails" into qt-r1-dev
am: 3f7230cb93

Change-Id: I8cc7b0729b35dfa7bb6bd2f19ce0bfbb842accf7
2019-07-25 14:38:22 -07:00
TreeHugger Robot
3f7230cb93 Merge "Preventing system crash when pin slice fails" into qt-r1-dev 2019-07-25 21:14:34 +00:00
Sunny Goyal
62f79d6b58 Preventing system crash when pin slice fails
ContentProvider calls can throw any generic exception it that was thrown
on the remote process. Ignore all such exceptions

Bug: 134802710
Test: atest PinnedSliceStateTest
Change-Id: I6f037905117adccbf5a65ee4ce4031f02aaa7780
2019-07-24 12:39:22 -07:00
Winson Chung
7ff14a69cf Merge "Modify deferred recents animation cancel to work without screenshot" into qt-r1-dev
am: 48e3cfc06a

Change-Id: If607c33898a4a4ed75a3768ae1027507edfc0437
2019-07-23 22:25:45 -07:00
Winson Chung
932a656359 Merge "Modify deferred recents animation cancel to work without screenshot" into qt-r1-dev
am: 48e3cfc06a

Change-Id: Id491b61fc851779bd398c5113a306ce1c89181dc
2019-07-23 22:24:38 -07:00
Winson Chung
7a545ae9cc Modify deferred recents animation cancel to work without screenshot
- Allow the recents animation runner to request deferring a cancel from
  stack order change until the next app transition start without using
  a screenshot. This allows launcher to set this state, then start an
  activity without a flash due to the animation not finishing immediately
- Always prepare a transition when using the deferred cancel to ensure
  an app transition callback
- Handle app transition canceled as well (if canceled, we continue to
  cancel recents the animation with/without the screenshot as requested)
- Remove internal lock and use the global WM lock when setting the defer
  cancel state
- Renamed a few methods to clarify the deferred cancel flow

Bug: 137196872
Test: atest FrameworksServicesTests:RecentsAnimationControllerTest
Test: atest WmTests:RecentsAnimationTest
Change-Id: Ie8f6f60b6bf6777e36f24749b30f90c8c26ee848
2019-07-23 15:50:33 -07:00
Mathew Inwood
047704a01f Merge "Always apply compat changes to system apps." am: e691553aa6 am: fe17bdccf9
am: ebd7b1c2ea

Change-Id: I790378ff858887374b4384f7f78cc87af5e163f8
2019-07-22 12:11:36 -07:00
Mathew Inwood
ebd7b1c2ea Merge "Always apply compat changes to system apps." am: e691553aa6
am: fe17bdccf9

Change-Id: I686647d8fa95d8fd788e76c48f518ebd51e6440e
2019-07-22 11:59:11 -07:00
Mathew Inwood
fe17bdccf9 Merge "Always apply compat changes to system apps."
am: e691553aa6

Change-Id: I85cba145cfe4258697c07831358292e9f4a03477
2019-07-22 11:49:28 -07:00
Mathew Inwood
345b1d5344 Always apply compat changes to system apps.
System apps should always get the "latest" behaviour from the platform
since they are updated with the platform.

Bug: 135010838
Test: atest CompatConfigTest
Change-Id: Ieacac20dc0eb02e4687dfe0b7b4800b3fce3db83
2019-07-22 11:38:40 +01:00
Lyn Han
25d544ba9f Merge "Secure => global bubble settings pt 1" into qt-r1-bubbles-dev 2019-07-18 14:30:16 +00:00
Lyn Han
4463f84e63 Secure => global bubble settings pt 1
Follow up to http://ag/8222583, which enables bubbles globally instead
of at the per-user level
- Remove user-specific tracking
- Remove Secure.NOTIFICATION_BUBBLES from backup
- Replace references to Secure.NOTIFICATION_BUBBLES with
Global.NOTIFICATION_BUBBLES
- Update tests

Fixes: 136034310
Bug: 129158983
Test: m RunSettingsRoboTests
Test: atest SystemUITests
Test: manual - work profile bubbles show up
Change-Id: I931f8f2640ac01fdf4c30ef9f9474fde7ca2d262
2019-07-18 07:28:27 -07:00
Louis Chang
e1cf45d7a2 Merge "Allow System ChooserActivity to start home activity" into qt-r1-dev
am: 32cc706519

Change-Id: Ib2b9813c86de2ba1a7016c0f16125104974e4586
2019-07-17 17:11:22 -07:00
Louis Chang
f16f8bcaa6 Merge "Allow System ChooserActivity to start home activity" into qt-r1-dev
am: 32cc706519

Change-Id: Ia5d4f18187951535143586bdb516a1df4ac73266
2019-07-17 07:59:53 -07:00
TreeHugger Robot
32cc706519 Merge "Allow System ChooserActivity to start home activity" into qt-r1-dev 2019-07-17 14:48:19 +00:00
Louis Chang
6a9be16607 Allow System ChooserActivity to start home activity
We should allow the system ChooserActivity [1] to start
home activities as the same reason we did for ResolverActivity.

[1] Ia50e21e2f8c6b6d0ed7207625e3b5aef214396bb.

Bug: 136270213
Test: atest ActivityRecordTests
Change-Id: I8e6db9e156af151e37db2eb6f03332a15e22b0f0
2019-07-17 12:56:16 +08:00
Eric Laurent
0d93fbaee1 Merge "NotificationManager: Fix notifications in VoIP call" into qt-r1-dev
am: 3d1ed4a582

Change-Id: Id6dd08142bf2d6294cf0037b2e3f954f5dcc4dd1
2019-07-16 20:00:07 -07:00
Eric Laurent
adb5e482d0 Merge "NotificationManager: Fix notifications in VoIP call" into qt-r1-dev
am: 3d1ed4a582

Change-Id: Ia4f6739205f889e5e90b7214b8df574e0f18802d
2019-07-16 20:00:03 -07:00
Eric Laurent
3d1ed4a582 Merge "NotificationManager: Fix notifications in VoIP call" into qt-r1-dev 2019-07-17 02:48:49 +00:00
Eric Laurent
7412abc3cb NotificationManager: Fix notifications in VoIP call
Also take VoIP call into account in addition to voice calls in the
logic overriding playback of notification sounds while in call.

Bug: 133533134
Test: place a Duo call and receive notifications
Change-Id: Idd70b62b439e9f6ec87e15838e2017223fb0865e
2019-07-16 17:15:29 -07:00
Daniel Solomon
6a9d5ddc45 Merge "Add ability to select composition color space for a given color mode" into qt-r1-dev
am: b5f152e34d

Change-Id: I6f99650582ba4f52e367905b40163fafaefdf04b
2019-07-16 15:59:17 -07:00
Daniel Solomon
9ab8dbeb3c Merge "Add ability to select composition color space for a given color mode" into qt-r1-dev
am: b5f152e34d

Change-Id: I29cf3e1645e6a69ac1d8847d54820806a0277d9c
2019-07-16 15:49:38 -07:00
Daniel Solomon
b5f152e34d Merge "Add ability to select composition color space for a given color mode" into qt-r1-dev 2019-07-16 22:28:00 +00:00
Daniel Solomon
41ee35fabf Add ability to select composition color space for a given color mode
Add the ability to specify a desired display composition color space
(sRGB, P3, etc.) for a given color mode (Natural, Boosted, etc.).
If no composition color space is specified, the composition color space
is unchanged.

Bug: 137140317
Bug: 137053654
Test: atest FrameworksMockingServicesTests:DisplayTransformManagerTest
Test: atest FrameworksServicesTests:ColorDisplayServiceTest
Change-Id: I37b01fa160d3965cea341781c0aa656f57e0f68f
2019-07-16 11:17:07 -07:00
Lyn Han
d2b7708bd6 Revert "Secure => global bubble settings pt 1"
This reverts commit ef8abd06f00a66e6e0bc175d1bc19942f2700821.

Reason for revert: fix test in other cl

Change-Id: Ia33880955985671455874552d6271e57c23f29c5
2019-07-15 18:09:22 +00:00
Lyn Han
ef8abd06f0 Secure => global bubble settings pt 1
Follow up to http://ag/8222583
- Remove Secure.NOTIFICATION_BUBBLES from backup.
- Replace references to Secure.NOTIFICATION_BUBBLES with
Global.NOTIFICATION_BUBBLES
- Update tests

Fixes: 136034310
Bug: 129158983
Test: atest SystemUITests
Test: manual - work profile bubbles show up
Change-Id: I0c1956272e9d18bcd2e13c6658ca8925cedfcef5
2019-07-14 02:48:22 +00:00
Michael Wright
d6bd615920 Merge "Read the high refresh rate blacklist from DeviceConfig." into qt-r1-dev
am: 6173ba7475

Change-Id: Ifcbac79c98889f3b0f1463537f5e179164e8075a
2019-07-11 20:52:21 -07:00
Michael Wright
000c605fe2 Merge "Read the high refresh rate blacklist from DeviceConfig." into qt-r1-dev
am: 6173ba7475

Change-Id: I443831f56e417efe3a124cb0a09ae25b1946bc3a
2019-07-11 20:52:03 -07:00
Mady Mellor
084dbe011c Merge "When summary is dismissed, don't remove bubble children" into qt-r1-bubbles-dev 2019-07-11 21:55:19 +00:00
Michael Wright
6a51b35a7d Read the high refresh rate blacklist from DeviceConfig.
When available, we should read the high refresh rate blacklist from
DeviceConfig, and use the device's configured list as a default /
fallback. This lets us change the blacklist in the field in case we find
additional compatibility issues, or one of the developers fixes their
app and asks us to remove them from the blacklist.

Fixes: 132338514
Test: atest WmTests:HighRefreshRateBlacklistTest
Exempt-From-Owner-Approval: TBR
Merged-In: I984dab60eeafff01758ac38c3db6056b33f662a6
Change-Id: I984dab60eeafff01758ac38c3db6056b33f662a6
2019-07-11 16:26:35 +02:00
TreeHugger Robot
4d3af78fe8 Merge "DO NOT MERGE: Deleted SurfaceControl.remove method" into qt-r1-bubbles-dev 2019-07-10 13:15:24 +00:00
chaviw
dd5bde0a3c DO NOT MERGE: Deleted SurfaceControl.remove method
Updated all callers of SC.remove to use Transaction.remove(sc) and apply
immediately since that's the equivalent. Eventually, the transactions
that contain remove could combine with other transactions if it makes
sense to avoid duplicate applies.

Test: SurfaceControlTest
Change-Id: I13c6ec86de6a6d60f142c2269337557510dd006d
Exempt-From-Owner-Approval: Already approved and merged in master.
2019-07-10 10:02:08 +00:00
Mady Mellor
22f2f076d0 When summary is dismissed, don't remove bubble children
Adds to onNotificationRemoveRequested to factor in:
  * summary dismissal: in this case the remove isn't intercepted, however, any bubble children in
    the children of the group are updated to not be visible in the shade
  * summary cancel: in this case if the summary is canceled the bubble
    children are also canceled
  * REASON_GROUP_SUMMARY_CANCELED - this is the indicator that the child
    is being removed because the summary was dismissed, in this case treat
    the bubble like its notification has been dismissed

Adds to NotificationManagerService so that NoMan won't remove any notifs
that are FLAG_BUBBLE because of a group summary removal.

Test: atest NotificationManagerServiceTest

Manual Tests:
1) User Dismiss
   - add enough bubbles to auto-bundle the notifications
   - swipe away the summary
   => Note that the bubbles still exist but now the dot is gone
2) Clear all (repeat above but clear all rather than swipe away)
3) Click on group
   - add a group with auto-cancel enabled
   - click on the group summary
   => Bubbles from that group should remain but the dot should be gone

Bug: 130250809
Change-Id: I2728152665817a0166cee72d969cbfdabc47067d
2019-07-09 17:30:56 -07:00
Paul Duffin
5c3e9d65e3 Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()
Test: atest \
    FrameworksServicesTests:com.android.server.pm.PackageInstallerSessionTest
Bug: 117535564

Change-Id: Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a
Merged-In: Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a
(cherry picked from commit c655c5fc2e2e2aaeea6e9ab42a6c2bf4b1b29450)
2019-07-09 11:52:23 +00:00
Paul Duffin
f87a1e05b0 Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()" into qt-dev-plus-aosp
am: 74c2ab1ddc

Change-Id: I059fca8a60cd1447ae882f1ab000dd74b018dc39
2019-07-08 12:58:47 -07:00
Paul Duffin
c655c5fc2e Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()
Test: atest \
    FrameworksServicesTests:com.android.server.pm.PackageInstallerSessionTest
Bug: 117535564

Change-Id: Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a
2019-07-08 14:57:53 +01:00
Adrian Roos
396cd58357 GestureNav: Fix broken exclusion rect calculation for modal windows am: b106379310
am: eb6ad762fc

Change-Id: I20da80f9f14db1f972620be91db38e5b78fced1e
2019-07-05 08:36:53 -07:00