Commit Graph

301953 Commits

Author SHA1 Message Date
Greg Plesur
d4ef6421e5 Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev
am: e50a485c22

Change-Id: If0ae1447b1931c498134f16ecf4bd51efa83b9e0
2016-11-04 14:09:33 +00:00
Greg Plesur
9ee91d8d11 If the current device is a watch, fix DeviceOwner/ProfileOwner logic.
am: 34fb70ab88

Change-Id: I901764f7bba26c921896d94444799185cce41932
2016-11-04 14:09:29 +00:00
Greg Plesur
e50a485c22 Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev 2016-11-04 14:02:12 +00:00
Manu Cornet
906a3a8e80 Slightly better encapsulation for the set of recent activities
Bug: 32101881
Test: Locally on Ryu device
Change-Id: Ibf2f5af268ec00abc8caa6232fb517b60545ad46
2016-11-04 06:58:37 -07:00
Hugo Benichi
8b06bcdfd2 Netd events: record connect() success/errno
Test: $ runtest frameworks-net pass
Bug: 32198976
Change-Id: I6c54aa2f9116a6009d96a050e30926493f9f60db
2016-11-04 21:54:39 +09:00
TreeHugger Robot
3d36fac235 Merge "Add SkiaProfileRenderer to draw visual debugging info" 2016-11-04 12:53:40 +00:00
Paulo Casanova
a256408b24 Renamed Aapt2.java to Aapt2Jni.java.
See http://ag/1590668 for a discussion.

Test: Done in tools
Change-Id: I3bfced0da98ab24531c1c1a79970841b32bfa1fa
2016-11-04 11:28:44 +00:00
TreeHugger Robot
4fb9c2d6f8 Merge "Added CMAS/ETWS duplicate expiration support" 2016-11-04 10:50:43 +00:00
TreeHugger Robot
cb291f38f8 Merge "Add shell command to move activity stacks between displays" 2016-11-04 09:00:10 +00:00
TreeHugger Robot
e966a97113 Merge "Added CMAS/ETWS duplicate expiration support" into nyc-mr2-dev 2016-11-04 08:23:01 +00:00
Jack Yu
c045652026 Added CMAS/ETWS duplicate expiration support
Now message duplication detection will only look back messages
for 24 hours by default for all countries, except 1 hour in
Japan.

Test: runtest -x packages/apps/CellBroadcastReceiver/tests/unit

bug: 31171149
Change-Id: I6765c9cebdb3bd9ab6d065f10acbd66047a34d8c
2016-11-04 00:50:17 -07:00
Hugo Benichi
fa8a6f6220 frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.

Test: $ runtest frameworks-net passes (expect Tether
Bug: 32561414
Change-Id: Ib42c4ab2d7214891cd451875ca4bf6db195538c1
2016-11-04 16:46:29 +09:00
TreeHugger Robot
2c442e962e Merge "Stop using return within finally" 2016-11-04 02:42:11 +00:00
Matt Sarett
cf2c05c652 Add SkiaProfileRenderer to draw visual debugging info
This adds support for debug.hwui.profile and
debug.hwui.show_dirty_regions to the Skia pipelines.

There still may be some follow up work for profiling
with visual bars.  The speed at which the renderer
is able to draw the rects in the graph is having a
noticeable effect on the actual data in the graphs.

Test: Verified that the features work as expected.

BUG:32370375

Change-Id: I24430da2bab3eb54f6a771f9c984f8ae0008a5a7
2016-11-03 21:42:58 -04:00
Eric Laurent
3fb608e4f3 AudioService: fix mismatch in device volume index for alias streams
Fix VolumeStreamState.setIndex() to force device volume
index update on an alias stream when no specific device volume exists
on the VolumeStreamState of this alias stream.

This prevents asymetric behaviors of setDeviceVolume() and setAllVolumes()
causing some stream types to be muted and
not unmuted if no specific device volume index exist.

Test: make
Test: wipe device, setup wizard, place call and check nofication volume

Bug: 32626244
Change-Id: Idd170aa9f295b0a9533a589e1891a04c05ab2f2f
2016-11-03 18:16:41 -07:00
TreeHugger Robot
8be6cc89ef Merge "Trust: Add missing cleanup upon removing user" 2016-11-04 00:38:15 +00:00
Andrii Kulian
839def9b54 Add shell command to move activity stacks between displays
Also rename "stack movetask" command to be consistent with other
shell commands.

Test: New CTS tests coming soon.
Change-Id: I3d7e04e0ae8ea76c27c3e4c1e286d5cd4539870c
2016-11-03 17:26:35 -07:00
Dianne Hackborn
a59ddd7961 Merge "Switch settings command to use "cmd" call on service." 2016-11-04 00:15:26 +00:00
TreeHugger Robot
10398dfb1d Merge "Order non-app window containers." 2016-11-03 23:54:20 +00:00
TreeHugger Robot
a5aa9ebed0 Merge "Doze: Fix broken non-AoD" 2016-11-03 23:42:18 +00:00
Andre Eisenbach
da9d0ecb83 Merge "BT: Don't switch devices when one of the connected BT headsets disconnects" am: 0bebfe76fc am: 2fe13541ad am: 51d7a455aa
am: 045226008c

Change-Id: Iacd5ae71b6338bcb461ae69cc09e5158fea502dc
2016-11-03 23:38:59 +00:00
Andre Eisenbach
045226008c Merge "BT: Don't switch devices when one of the connected BT headsets disconnects" am: 0bebfe76fc am: 2fe13541ad
am: 51d7a455aa

Change-Id: Ia5b8bcbb6f42ef939abe71b74327d845e4a11768
2016-11-03 23:32:10 +00:00
John Reck
f6113af2d6 Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
2016-11-03 16:26:59 -07:00
sergeyv
7d5219fb50 Reference colorspace during creation of SkImageInfo
Change-Id: I515060776ef13ad125c7e8513ea10944ef2d4a79
Test: manual.
bug:32621254
2016-11-03 16:25:37 -07:00
Andre Eisenbach
51d7a455aa Merge "BT: Don't switch devices when one of the connected BT headsets disconnects" am: 0bebfe76fc
am: 2fe13541ad

Change-Id: Iba20aef49c4d34875d8521cba82e6ffc26051ac3
2016-11-03 23:25:37 +00:00
Andre Eisenbach
2fe13541ad Merge "BT: Don't switch devices when one of the connected BT headsets disconnects"
am: 0bebfe76fc

Change-Id: Ibd4c4f9defec469bb14a282c53d64932123d4905
2016-11-03 23:22:07 +00:00
Andre Eisenbach
0bebfe76fc Merge "BT: Don't switch devices when one of the connected BT headsets disconnects" 2016-11-03 23:13:18 +00:00
Phil Weaver
a46f009bbf Merge "Add tests for MagnificationController." 2016-11-03 23:11:55 +00:00
TreeHugger Robot
c2a2b94393 Merge "Get rid of Keyguard visibility modifiers on WindowState" 2016-11-03 23:08:26 +00:00
Phil Weaver
3cdd6c7654 Add check for null manger for a11y recents action
Bug: 31986988

Test: Ran A11y cts
Change-Id: Ia6a1e1b921d8b0008edbcf1f1a8d1d3d0eb969c6
2016-11-03 15:52:02 -07:00
Garfield Tan
0b3cf666d0 Unhide findPath() API. Add JavaDoc to related features.
Also remove comments that disallow folders in search results.

Test: It builds.

Bug: 30948740
Bug: 32512923
Change-Id: I72706b69163aa98ee9568939e09e5048b6e8f9f8
2016-11-03 15:42:18 -07:00
Jean-Michel Trivi
ecbf80b62d Merge "MediaRecorder: Fix some audio source descriptions" 2016-11-03 22:34:15 +00:00
Michael Kwan
94438b77db Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.

Test: manual - adb shell am supports-multiwindow
Bug: 30120559
Change-Id: If5e251a878a29cef2365715b18e4275e4f1ff0ca
2016-11-03 15:31:58 -07:00
TreeHugger Robot
eea591b08e Merge "Fix RenderNodeDrawable to draw nonzero Z nodes when needed" 2016-11-03 22:30:11 +00:00
Phil Weaver
b2dc39c09e Merge "Make calls from apps to a11y oneway." 2016-11-03 22:23:27 +00:00
Selim Cinek
0294f9e39b Fixed a bug with the emergency affordance in multi user
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.

Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes: 32424103
Test: manual: switch to secondary user and launch emergency affordance
2016-11-03 14:58:01 -07:00
Jack Yu
f8247928a2 Added CMAS/ETWS duplicate expiration support
Now message duplication detection will only look back messages
for 24 hours by default for all countries, except 1 hour in
Japan.

Test: runtest -x packages/apps/CellBroadcastReceiver/tests/unit

bug: 31171149
Change-Id: I6765c9cebdb3bd9ab6d065f10acbd66047a34d8c
2016-11-03 14:53:41 -07:00
Adrian Roos
ae025828bb Trust: Add missing cleanup upon removing user
Change-Id: I4a1d9d38344aea54d1f0ae6d6834a45b2e73cb1c
Fixes: 31995569
2016-11-03 14:46:21 -07:00
Ray Essick
7601049275 Stop using return within finally
Refactor code to avoid a return statement inside a finally block. Such
constructs interfere with exception propagation in non-obvious ways
and are therefore considered bad practice.

Bug: 32586420
Test: manual code walk
2016-11-03 14:45:56 -07:00
Greg Plesur
34fb70ab88 If the current device is a watch, fix DeviceOwner/ProfileOwner logic.
In this case, don't require the device to have gone through the
Setup Wizard before disqualifying DO/PO if there's an incompatible
account on the device.

BUG: 32438704,32438210

Change-Id: I6858db13c8df6e95d01d18a903f4343f70370e8b
2016-11-03 17:35:42 -04:00
Robert Carr
15dd7efeb7 Tests for computeFrameLw docked type scenarios.
Add some computeFrameLw unit tests for non fullscreen
windows. A test a day keeps the chase-list away.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowFrameTests
Change-Id: Ifd7c07f5d174b35aa73b78ddc3432520fb096bf9
2016-11-03 14:26:58 -07:00
Stephen Chen
ab8220f340 Merge "Document Subtype additions for ACTION_WIFI_CONNECT, ACTION_WIFI_OFF." 2016-11-03 21:09:49 +00:00
Satish Kodishala
2980980a75 BT: Don't switch devices when one of the connected BT headsets disconnects
Usecase:
1. Enable multi-hf.
2. Connect to HS1.
3. Connect to HS2.
4. Make a call on AG. Here call audio is present on HS2.
5. Now disconnect HS1 from AG.

Failure:
When HS1 is disconnected, call audio is routed to handset/speaker.

Root cause:
When hs1 disconnection intent is received, SCO path is cleared
and audio is routed to handset/speaker.

Fix:
Check if the device being disconnected is same as the device
call audio is present before clearing SCO path.

Change-Id: If83325679b70b5893e44e8d844000ee028d0246c
2016-11-03 20:57:56 +00:00
Wale Ogunwale
3a93169454 Order non-app window containers.
- Add non-app window tokens to the display child container based on
their base layer so the highest based layer is z-ordered on-top.
- Separated DisplayContent.mNonAppWindowContainers into
mAboveAppWindowContainer and mBelowAppWindowContainer where the former
contains non-app windows that should be z-ordered on-top of all app
windows and the later contains non-app windows that should be
z-ordered below app windows.
- Change wallpaper base layer to 1 so that it is always below all other
window types.
- Add Ime related windows/tokens to DisplayContent.mImeWindowContainers
so that we can track them together
- Use alternative binder token when adding window TYPE_INPUT_METHOD_DIALOG
so that it can properly be associated as an IME token in WM vs. with
system_server or sys-ui token.

Test: Existing tests pass.
Bug: 30060889
Change-Id: Ib53e09af12545868c3741d83aaccb7311c872b41
2016-11-03 20:56:57 +00:00
Etan Cohen
8402d511c9 Merge "Update service test runner to allow test args" am: 56b92e8191 am: dde9ea21e4 am: 10840d1897
am: be8e13de60

Change-Id: I48302e70e01fb290634f66bd679268fea0ede22d
2016-11-03 20:45:31 +00:00
Etan Cohen
be8e13de60 Merge "Update service test runner to allow test args" am: 56b92e8191 am: dde9ea21e4
am: 10840d1897

Change-Id: I200c88f0d6d00bef77fe00a59f8e99b3b91f7aa2
2016-11-03 20:39:26 +00:00
Greg Plesur
c33f83c13c Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am: 343dbac2e0 am: c447d9ef6a
am: 0cbe2e1a5c

Change-Id: I98803fd185b5d523e5aec610d29c112ee78a6254
2016-11-03 20:37:33 +00:00
Greg Plesur
794e66cfd2 New Wear devices need to update their DISABLE_LOCKSCREEN_KEY. am: eb2e45369a am: a71a0b8da1
am: e44736a819

Change-Id: I36f1980ede5ea483c4750386a7b5905254ce33f8
2016-11-03 20:36:27 +00:00
Etan Cohen
10840d1897 Merge "Update service test runner to allow test args" am: 56b92e8191
am: dde9ea21e4

Change-Id: I59d572e233720ecf0ddc6cbb5893323b563a3241
2016-11-03 20:32:54 +00:00
Greg Plesur
0cbe2e1a5c Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am: 343dbac2e0
am: c447d9ef6a

Change-Id: I17a831ab2c537c00452f250d151ec3f63b2d6277
2016-11-03 20:30:59 +00:00