Tomasz Wasilczyk
9fa0287c18
Dummy implementation get/setMute calls of ITuner.
...
This is also not implemented in the native service.
Test: instrumentation
Bug: b/36863239
Change-Id: I2e5ceaec7a98eec0af6101a2f91dabd1cde2e090
2017-05-04 08:13:05 -07:00
Jorim Jaggi
0767c5ed64
Merge "Fix snapshots for secure windows" into oc-dev am: bf08eb6da7
...
am: b928547fc5
2017-05-03 17:44:29 +00:00
Jorim Jaggi
b928547fc5
Merge "Fix snapshots for secure windows" into oc-dev
...
am: bf08eb6da7
2017-05-03 17:37:01 +00:00
TreeHugger Robot
bf08eb6da7
Merge "Fix snapshots for secure windows" into oc-dev
2017-05-03 17:29:21 +00:00
Santos Cordon
0a0570584e
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev am: e4e953ae4c
...
am: 70deb628b8
2017-05-03 17:18:54 +00:00
Santos Cordon
70deb628b8
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
...
am: e4e953ae4c
2017-05-03 17:15:00 +00:00
Christine Franks
3fcdfa1b96
Merge "Night display status restores on reboot/user change" into oc-dev am: 78e03b44c3
...
am: 0bd001e95c
2017-05-03 17:14:52 +00:00
Android Build Merger (Role)
438931ab9a
Merge "Merge "Treat apps that use channels as O apps" into oc-dev am: b0744b820a am: 65c95aab05"
2017-05-03 17:08:49 +00:00
TreeHugger Robot
e4e953ae4c
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
2017-05-03 17:08:31 +00:00
Julia Reynolds
036bf8e18b
Merge "Treat apps that use channels as O apps" into oc-dev am: b0744b820a
...
am: 65c95aab05
2017-05-03 17:07:34 +00:00
TreeHugger Robot
ec3ca11178
Merge "Add TestableResources"
2017-05-03 17:07:14 +00:00
Christine Franks
0bd001e95c
Merge "Night display status restores on reboot/user change" into oc-dev
...
am: 78e03b44c3
2017-05-03 17:06:42 +00:00
TreeHugger Robot
78e03b44c3
Merge "Night display status restores on reboot/user change" into oc-dev
2017-05-03 17:02:15 +00:00
Chen Xu
4078f993ba
Merge "support locale change for notification channels" into oc-dev am: dd373a838d
...
am: 7f9b31601e
2017-05-03 16:58:23 +00:00
Julia Reynolds
65c95aab05
Merge "Treat apps that use channels as O apps" into oc-dev
...
am: b0744b820a
2017-05-03 16:53:22 +00:00
Julia Reynolds
b0744b820a
Merge "Treat apps that use channels as O apps" into oc-dev
2017-05-03 16:50:33 +00:00
Chen Xu
7f9b31601e
Merge "support locale change for notification channels" into oc-dev
...
am: dd373a838d
2017-05-03 16:47:09 +00:00
Chen Xu
dd373a838d
Merge "support locale change for notification channels" into oc-dev
2017-05-03 16:42:50 +00:00
Wale Ogunwale
22404fb661
Merge "Only allow AM to update display orientation based on app containers" into oc-dev am: 9304756c28
...
am: 4f49a5c7ba
2017-05-03 16:33:59 +00:00
Wale Ogunwale
4f49a5c7ba
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
...
am: 9304756c28
2017-05-03 16:26:53 +00:00
Roozbeh Pournader
22d174b9ac
Merge "Update unit tests for forward delete" into oc-dev am: 995b4a2185
...
am: 465033c145
2017-05-03 16:26:50 +00:00
Roozbeh Pournader
465033c145
Merge "Update unit tests for forward delete" into oc-dev
...
am: 995b4a2185
2017-05-03 16:21:52 +00:00
TreeHugger Robot
9304756c28
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
2017-05-03 16:21:41 +00:00
TreeHugger Robot
995b4a2185
Merge "Update unit tests for forward delete" into oc-dev
2017-05-03 16:13:15 +00:00
Julia Reynolds
90ac4b0ab5
Merge "Sorting and intrusiveness updates" into oc-dev am: abfa176b45
...
am: ea447b0f40
2017-05-03 15:56:37 +00:00
Julia Reynolds
ea447b0f40
Merge "Sorting and intrusiveness updates" into oc-dev
...
am: abfa176b45
2017-05-03 15:46:07 +00:00
Tomasz Wasilczyk
ecfd85f5b4
Merge "Implement get/setConfiguration calls of ITuner."
2017-05-03 15:42:37 +00:00
TreeHugger Robot
abfa176b45
Merge "Sorting and intrusiveness updates" into oc-dev
2017-05-03 15:39:32 +00:00
Jason Monk
77f1b05fb0
Add TestableResources
...
Makes it easy to add or change values of resources from tests.
Test: runtest --path frameworks/base/tests/testables/tests
Change-Id: Iaedff3d4ce9eaf9f270e7c62bc8c1634bd3519ec
2017-05-03 11:21:03 -04:00
Bartosz Fabianowski
4afd39e718
Merge "Add more explicit documentation for install reason" into oc-dev am: c8ca16a85a
...
am: 68e947c1bb
2017-05-03 15:20:45 +00:00
Jorim Jaggi
d635a4ae20
Fix snapshots for secure windows
...
First, also draw system bar backgrounds when drawing a fake
snapshot. For that, refactor the drawing into a separate class so
it can be reused. Also enable fake snapshots for secure windows.
Test: com.android.server.wm.TaskSnapshotControllerTest
Test: com.android.server.wm.TaskSnapshotSurfaceTest
Test: Secure activity with resuming delay, make sure system bars
are covered when reopening app.
Bug: 35710126
Change-Id: I2f0ebc7e7acb80015780a4e882f0a472599efa30
2017-05-03 17:20:40 +02:00
Bartosz Fabianowski
68e947c1bb
Merge "Add more explicit documentation for install reason" into oc-dev
...
am: c8ca16a85a
2017-05-03 15:15:20 +00:00
TreeHugger Robot
c8ca16a85a
Merge "Add more explicit documentation for install reason" into oc-dev
2017-05-03 15:10:16 +00:00
Christine Franks
e5bb03e2ea
Night display status restores on reboot/user change
...
Fixes: 30086742
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services
Change-Id: I264be077e607baf8e19496f0c57549a907668005
2017-05-03 15:00:43 +00:00
Julia Reynolds
07a08b2ae9
Treat apps that use channels as O apps
...
... even if they don't target O
- Delete misc channel
- Read settings from channel instead of notification
Test: runtest systemui-notification
Change-Id: I00814959eddd10998806dd67cc30421091ae9aab
Fixes: 37540996
Fixes: 35378789
2017-05-03 10:36:12 -04:00
Wale Ogunwale
5f1ae6aaca
Only allow AM to update display orientation based on app containers
...
Activity manager choregraphs several app states when starting an
activity including when the display orientation should be updated based
on the app that is now in the foreground. It is possible for a call to
originate within WM after AM adds the starting app token, but before AM
makes the app visible and resumed. E.g. A relayout call due to a
starting window. When this happens WM can prematurely update the display
orientation with incomplete information causing the starting app to be
in an incorrect orientation initially.
To fix this problem we now only factor in app containers (stacks, task,
..) when updating the display orientation if the call to update is
coming from AM. Otherwise we only use the non-app/system containers to
determine the orientation or return the last orientation.
Change-Id: I431ce9260ee31257732311a548c62cbcdb27eae7
Fixes: 37550022
Test: Launch 2 apps that don't fix orientation and use the recent button
to switch between them while holding the device in landscape.
2017-05-03 07:22:24 -07:00
Johan Torås Halseth
5b28415300
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev am: 3eafb6e2c6
...
am: bdc3dd8d5d
2017-05-03 14:07:47 +00:00
Johan Torås Halseth
bdc3dd8d5d
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
...
am: 3eafb6e2c6
2017-05-03 14:02:11 +00:00
TreeHugger Robot
3eafb6e2c6
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
2017-05-03 13:55:54 +00:00
Adrian Roos
673c07f3da
Merge "DozePlugin: Remove" into oc-dev am: b2484f2258
...
am: 825b574892
2017-05-03 13:55:11 +00:00
Adrian Roos
825b574892
Merge "DozePlugin: Remove" into oc-dev
...
am: b2484f2258
2017-05-03 13:49:41 +00:00
Julia Reynolds
2445037bb9
Sorting and intrusiveness updates
...
- The intrusiveness extractor needs to know about channels
- Allow comparisons by contact affinity even in the min bucket.
Test: cts-verifier, attention management test
Bug: 36197567
Change-Id: I1bb53d758fc2334aad5e380620fc6e39a724195c
2017-05-03 09:45:11 -04:00
TreeHugger Robot
b2484f2258
Merge "DozePlugin: Remove" into oc-dev
2017-05-03 13:43:19 +00:00
Jorim Jaggi
60e305ce8c
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev am: 251894b134
...
am: 53f6c02354
2017-05-03 13:28:39 +00:00
Geoffrey Pitsch
85ec45ba27
Merge "Delete default channel for all apps targeting O." into oc-dev am: b9ee2d4677
...
am: 29fecaf2a6
2017-05-03 13:26:43 +00:00
Jorim Jaggi
53f6c02354
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
...
am: 251894b134
2017-05-03 13:21:52 +00:00
Geoffrey Pitsch
29fecaf2a6
Merge "Delete default channel for all apps targeting O." into oc-dev
...
am: b9ee2d4677
2017-05-03 13:19:03 +00:00
Bartosz Fabianowski
40a006285b
Add more explicit documentation for install reason
...
This CL adds more explicit documentation of the install reason argument /
return value to PackageInstaller.SessionInfo.
Bug: 37324584
Test: None
Change-Id: I2450cc669b194e611c5dc07c6a0a5cd78a98c039
2017-05-03 15:17:36 +02:00
TreeHugger Robot
251894b134
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
2017-05-03 13:16:32 +00:00
Geoffrey Pitsch
b9ee2d4677
Merge "Delete default channel for all apps targeting O." into oc-dev
2017-05-03 13:15:21 +00:00
