Commit Graph

10329 Commits

Author SHA1 Message Date
Wale Ogunwale
951fdd64db Merge "Allow CTS test to control organized tasks" into rvc-dev am: 201af5078f am: ef931eee02
Change-Id: I4ed81bb4af88b677642df9ba9471920c235ff2ab
2020-04-21 22:27:47 +00:00
Wale Ogunwale
201af5078f Merge "Allow CTS test to control organized tasks" into rvc-dev 2020-04-21 22:01:40 +00:00
Alex Salo
bbffba6a38 Merge "Don't reset adaptive_sleep setting" into rvc-dev am: 323d63572d am: bff61b895a
Change-Id: I7d59ed97e4bca6c541eb3600faf6bc60741bb485
2020-04-21 22:00:47 +00:00
Alex Salo
323d63572d Merge "Don't reset adaptive_sleep setting" into rvc-dev 2020-04-21 21:27:38 +00:00
Danning Chen
cc197c0644 Merge "Keep the conversation shortcut criteria in People Service consistent with the one in Notification Manager" into rvc-dev am: 068558b44b
Change-Id: I8415e26680ff80b3e5754709362d1b90eff4fad5
2020-04-21 20:11:29 +00:00
Danning Chen
068558b44b Merge "Keep the conversation shortcut criteria in People Service consistent with the one in Notification Manager" into rvc-dev 2020-04-21 20:09:30 +00:00
Amy Zhang
1d80fcf7d1 Merge "Complete the Cas System request/release/update implementation in TRM" into rvc-dev am: aaa8e866d3
Change-Id: I21e76d3dc60dc10a00b860750c15549bc62667a4
2020-04-21 19:07:09 +00:00
Amy Zhang
aaa8e866d3 Merge "Complete the Cas System request/release/update implementation in TRM" into rvc-dev 2020-04-21 18:56:39 +00:00
Danning Chen
07cfaa6b08 Keep the conversation shortcut criteria in People Service consistent with the one in Notification Manager
Before this change, People Service uses the presence of the Person object
in ShortcutInfo as the criteria of conversation shortcut. This changes
the criteria that the shortcut needs to be a share shortcut instead of having Person object.

Change-Id: I1ea52a50c909ca96365c1d4e55af97931d048d8f
Test: atest ShortcutHelperTest
Test: atest DataManagerTest
Bug: 154254830
2020-04-21 10:51:20 -07:00
Miranda Kephart
b041c1a837 Merge "Add screenshots logging" into rvc-dev am: 44cc1e274b
Change-Id: I399d940c094ceab6c9996449505499bff71493a8
2020-04-21 17:08:15 +00:00
Miranda Kephart
44cc1e274b Merge "Add screenshots logging" into rvc-dev 2020-04-21 16:58:54 +00:00
TreeHugger Robot
93ca2e6070 Merge changes I9be69af5,Ib85ee393 into rvc-dev am: faf1d06d45
Change-Id: I8674e62e64d0c432e3980287ed491090717a15eb
2020-04-21 13:30:10 +00:00
TreeHugger Robot
faf1d06d45 Merge changes I9be69af5,Ib85ee393 into rvc-dev
* changes:
  Clear uninstall block when removing DO.
  Clean up app restrictions when removing DO or PO
2020-04-21 13:25:30 +00:00
Pavel Grafov
ae92baceeb Clean up app restrictions when removing DO or PO
+ don't send broadcast when clearing already empty restrictions.

Bug: 149075700
Test: manual, set TestDPC as a DO, set restriction, remove DO.
Test: manual, set TestDPC in COMP, set restriction, migrate to COPE.
Change-Id: Ib85ee3937c43cde1cca0dad8117cd0f8dd642fd8
2020-04-21 12:24:37 +01:00
TreeHugger Robot
17508db5fb Merge "Apply WindowTestRunner to RefreshRatePolicyTest" into rvc-dev am: e9d2790cfa
Change-Id: Ied3d157346bc97932bb723f998b66417deda0d86
2020-04-21 03:36:48 +00:00
TreeHugger Robot
e9d2790cfa Merge "Apply WindowTestRunner to RefreshRatePolicyTest" into rvc-dev 2020-04-21 03:31:02 +00:00
TreeHugger Robot
8acbb3a70a Merge "Update the surface size for tasks when config changes" into rvc-dev am: 177980b87d
Change-Id: I788a073dc77e7eca2f717452f1cae81bdf68af2f
2020-04-21 03:05:14 +00:00
TreeHugger Robot
177980b87d Merge "Update the surface size for tasks when config changes" into rvc-dev 2020-04-21 03:02:21 +00:00
Evan Rosky
f0e8a2dc96 Merge "Home tasks inherit split or fullscreen from parent." into rvc-dev am: 48c653a2c1
Change-Id: I4522134a78d29ae55405ed35da7c39f3cbffbe34
2020-04-21 02:46:45 +00:00
Evan Rosky
48c653a2c1 Merge "Home tasks inherit split or fullscreen from parent." into rvc-dev 2020-04-21 02:21:18 +00:00
Evan Rosky
c440b4e458 Home tasks inherit split or fullscreen from parent.
Also, changes the "inheritance" of bounds-based configs so
that when the window bounds are overridden, the configs will
implicitly also be overridden (recalculated against display)
appBounds and screenW/H match the overridden bounds.

Bug: 154331729
Bug: 153662925
Test: enter split-screen, open ime in launcher. Updated some
      tests to check for this expectation.
Change-Id: I1e37d8d116fde90428036bc54a2a77b293cee338
2020-04-20 17:02:08 -07:00
Darryl Johnson
b3c4f286f4 Merge "Fix ActivityManagerServiceTest and OomAdjustTests." into rvc-dev am: 470e4ac962
Change-Id: Id5cd04b6df6a7fa404764b3e53ee79ebb591952b
2020-04-20 23:26:44 +00:00
Darryl Johnson
470e4ac962 Merge "Fix ActivityManagerServiceTest and OomAdjustTests." into rvc-dev 2020-04-20 23:21:05 +00:00
Mark Renouf
19be640d6f Merge "Scroll Capture Framework" into rvc-dev am: 03f9a814a5
Change-Id: Ie9cc6da06f1d900a3750750df9f70fa4a9868d52
2020-04-20 19:23:54 +00:00
Alex Salo
b20aa8b110 Don't reset adaptive_sleep setting
Always respect user setting since we can't meaningfully recover from
the loss.

Bug: 153765285
Test: manually
Change-Id: I29f3b82e2c40d80c36721882724846a7439454eb
2020-04-20 19:21:55 +00:00
Mark Renouf
03f9a814a5 Merge "Scroll Capture Framework" into rvc-dev 2020-04-20 19:20:13 +00:00
Haining Chen
b2eab8175a Merge "Add unit tests for LockSettingsStrongAuth" into rvc-dev am: 01f08dcef1
Change-Id: Iaeeeb321be73d16d4cf9854e98efd4330bad8ea7
2020-04-20 17:30:33 +00:00
Haining Chen
01f08dcef1 Merge "Add unit tests for LockSettingsStrongAuth" into rvc-dev 2020-04-20 17:12:37 +00:00
TreeHugger Robot
0cabba4645 Merge "Consolidate TaskDisplayArea#addStack and TaskDisplayArea#addChild" into rvc-dev am: 53e927f890
Change-Id: I8e870a490b563b18227e22c877ddf80dc955c7e3
2020-04-20 16:10:49 +00:00
TreeHugger Robot
53e927f890 Merge "Consolidate TaskDisplayArea#addStack and TaskDisplayArea#addChild" into rvc-dev 2020-04-20 15:49:43 +00:00
Mark Renouf
a927929d99 Scroll Capture Framework
This is an implementation of long screenshots supporting
interactive, incremental capture of scrolling content using
a cooperative API between the app process and the system.

Design goals:

 - Provide for tile based incremental screenshots of scrolling content
 - Support existing apps without developer action
 - Provide support for non View-based Apps & UI toolkits

Bug: 148131831
Test: atest \
      FrameworksCoreTests:android.view.ScrollCaptureClientTest \
      FrameworksCoreTests:android.view.ScrollCaptureTargetResolverTest \
      FrameworksCoreTests:com.android.internal.view.ViewGroupScrollCaptureTest \
      FrameworksCoreTests:android.view.ScrollViewCaptureHelperTest \
      WmTests:com.android.server.wm.DisplayContentTest

Merged-In: I6c66a623faba274c35b8fa857d3a72030a763aea
Change-Id: I6c66a623faba274c35b8fa857d3a72030a763aea
2020-04-20 15:07:59 +00:00
Chilun
01182606dd Apply WindowTestRunner to RefreshRatePolicyTest
That fixes the race condition by the runner automatically locking the
window manager global lock.

Bug: 153707947
Test: atest RefreshRatePolicyTest
Change-Id: Ib2d6e76472934c90b438733835398878c1298dea
2020-04-20 12:09:58 +00:00
TreeHugger Robot
b47caff2e4 Merge "Refactor the installer name verification so that we do not crash on Android Auto where the UID can change depending on the user." into rvc-dev am: 34ef20fa5c
Change-Id: Id4887035bfbc65366232b3d7a24a2c757a64d739
2020-04-20 10:06:51 +00:00
TreeHugger Robot
34ef20fa5c Merge "Refactor the installer name verification so that we do not crash on Android Auto where the UID can change depending on the user." into rvc-dev 2020-04-20 09:34:46 +00:00
Louis Chang
2570e33425 Update the surface size for tasks when config changes
The surface size was only set for the root task and the
surface size was not updated after entering split-screen
mode since those tasks were reparented to split-screen
organized tasks and were no longer be the root tasks.

Applying crop to root tasks, unless the task is created by
organizer. And also remove crop of the descendant tasks.

Bug: 153605363
Test: enter split-screen and rotate device
Test: atest TaskStackTests
Change-Id: I7b21c20dc676aa0be06c3c6e1b6b11c07a3d048d
2020-04-20 03:10:38 +00:00
Wale Ogunwale
20ab6d4999 Allow CTS test to control organized tasks
Changes to allow CTS test to control organized task so we can have the
tests run the same way sys-ui is driving things now. Control is given
back to sys-ui once the test is done running.

Bug: 149338177
Test: atest CtsWindowManagerDeviceTestCases:SplitScreenTests
Change-Id: I74a03ee3411f5b10ea4e26c1cc3c663dc394dd97
2020-04-19 19:09:33 -07:00
TreeHugger Robot
e2f710fa40 Merge "Adjusting focus starting from sibling rootable app tasks" into rvc-dev am: d4fdca6e39
Change-Id: I4947aa0b4c79cf825c8610df77c774e78b06a065
2020-04-20 02:02:08 +00:00
TreeHugger Robot
d4fdca6e39 Merge "Adjusting focus starting from sibling rootable app tasks" into rvc-dev 2020-04-20 01:39:23 +00:00
Haining Chen
856868753f Add unit tests for LockSettingsStrongAuth
Bug: 151877480
Bug: 141025588
Test: make -j
Test: atest LockSettingsStrongAuthTest

Change-Id: Icaa3f5ab10d94944761700c2e072a3f86d35cdc0
2020-04-19 17:30:21 -07:00
Lee Shombert
656bf159fd Merge "Disable binder caches in unit tests" into rvc-dev am: 9bca3a380d
Change-Id: I5c3f77f70b12ccf00909bca4f44249357c69f062
2020-04-19 19:26:27 +00:00
Lee Shombert
9bca3a380d Merge "Disable binder caches in unit tests" into rvc-dev 2020-04-19 19:07:24 +00:00
Omer Nebil Yaveroglu
c85619664d Refactor the installer name verification so that we do not crash on
Android Auto where the UID can change depending on the user.

Test: atest AppIntegrityManagerServiceImpl
Bug: 154186326
Bug: 153998363
Change-Id: I3b5a16ae71308a12da405458768ddd2d419fbabd
2020-04-19 02:02:49 +01:00
Joshua Duong
afb6eb2098 Merge "Comply with naming convention in RFC6335." into rvc-dev am: 4f777adb27
Change-Id: I0d02cb2de301a7f25a30030bf2f0d6be8d7ac988
2020-04-18 17:02:16 +00:00
Joshua Duong
4f777adb27 Merge "Comply with naming convention in RFC6335." into rvc-dev 2020-04-18 16:41:59 +00:00
Shawn Lin
83fa44ffa3 Merge "Fixed incorrect size and position of a snapshot starting window in waterfall device." into rvc-dev am: ae4f136023
Change-Id: Ib519cb853ce88ab0f1f912e86a593cc14547a266
2020-04-18 11:18:45 +00:00
Shawn Lin
ae4f136023 Merge "Fixed incorrect size and position of a snapshot starting window in waterfall device." into rvc-dev 2020-04-18 10:57:34 +00:00
Joshua Duong
feba814585 Comply with naming convention in RFC6335.
Bug: 154268895

Test: atest AdbDebuggingManagerTest
Change-Id: I380e91be005471eb69b70eff6b047c0e6a0356d4
(cherry picked from commit acd10e2f9f)
2020-04-18 02:52:14 +00:00
TreeHugger Robot
def5442913 Merge "Fixed Task#getVisibility to take into account task hierarchy" into rvc-dev am: 872afaeaeb
Change-Id: I7cc51bde785b545f41707d5ae5974c5c643672f7
2020-04-18 02:25:39 +00:00
TreeHugger Robot
872afaeaeb Merge "Fixed Task#getVisibility to take into account task hierarchy" into rvc-dev 2020-04-18 02:23:41 +00:00
Amy Zhang
e1e65f18c0 Complete the Cas System request/release/update implementation in TRM
Test: atest
Bug: 154076250
Change-Id: Ifaf80a3e91807e1b47e780d2b5fd699412e1e7cc
2020-04-18 01:19:34 +00:00