TreeHugger Robot
ed9ee58170
Merge "resolve merge conflicts of 1238daf to master"
2016-10-27 02:50:25 +00:00
Marie Janssen
1e012d93c7
resolve merge conflicts of 1238daf to master
...
Change-Id: Icc70d291379d4f4816881e46704197513e6d548e
2016-10-26 17:57:22 -07:00
Tomasz Mikolajewski
1815241e78
Merge "Remove no longer used FLAG_ARCHIVE."
2016-10-27 00:56:31 +00:00
Marie Janssen
1238daf20d
Bluetooth: prevent enabling BLE in airplane mode am: a80d745c65 am: 6affbde556
...
am: 73bfd25356
2016-10-27 00:29:51 +00:00
Marie Janssen
6affbde556
Bluetooth: prevent enabling BLE in airplane mode
...
am: a80d745c65
2016-10-27 00:20:17 +00:00
Marie Janssen
a80d745c65
Bluetooth: prevent enabling BLE in airplane mode
...
Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.
Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.
Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble
Bug: 32140251
Bug: 32140271
Bug: 32369494
Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
(cherry picked from commit bd93b7b3dc6141cef6236cf0ca7dcc5acf5bfeed)
2016-10-26 14:55:47 -07:00
TreeHugger Robot
199e3683d1
Merge changes I2d9f1a2d,I01fd8ba6
...
* changes:
Ensure PIP retains bounds on device rotation.
Fix wrong bounds being used in landscape.
2016-10-26 21:48:09 +00:00
TreeHugger Robot
a917d708e9
Merge "Fix bug in which some Views were not executing enter transition."
2016-10-26 20:07:47 +00:00
Winson Chung
303c6b78b6
Fix wrong bounds being used in landscape.
...
- Ensure we use the right display size when calculating PIP bounds.
- Also update interface to take the display id.
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackDefaultBounds
Test: #testPinnedStackMovementBounds
Change-Id: I01fd8ba6dee212c29a9a092673ee8f7843e41af6
2016-10-26 12:49:40 -07:00
TreeHugger Robot
89aa8b9266
Merge "Import android.hardware.thermal@1.0 constants into HardwarePropertiesManager."
2016-10-26 19:40:42 +00:00
Andreas Huber
cbd1bb9532
Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3 am: 8bd63a39f3 am: 63f0ebc7a8
...
am: 525489b087
2016-10-26 16:03:29 +00:00
Andreas Huber
63f0ebc7a8
Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3
...
am: 8bd63a39f3
2016-10-26 15:54:20 +00:00
Andreas Huber
8bd63a39f3
Merge "Adds support for specifying the version of a service to register/lookup."
...
am: c3d8550cf3
2016-10-26 15:49:52 +00:00
Andreas Huber
c3d8550cf3
Merge "Adds support for specifying the version of a service to register/lookup."
2016-10-26 15:38:45 +00:00
Romain Guy
1de993c768
Merge "Add a half-precision floating point type"
2016-10-25 23:41:57 +00:00
Leonard Mosescu
f3409ceee5
Adding "attach-agent" to ActivityManagerShellCommand
...
This new command is used to attach runtime agents to a running application:
attach-agent <PROCESS> <FILE>
Attach an agent to the specified <PROCESS>,
which may be either a process name or a PID.
Test: m test-art-host, manual testing:
. invalid syntax, missing arguments
. invalid syntax, extra arguments
. invalid numeric PID
. invalid process name
. valid process, not debuggable
. valid process, missing agent
. valid process, valid agent
Bug: 31682382
Change-Id: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
2016-10-25 22:42:39 +00:00
Dianne Hackborn
fe51103711
Merge "Tweak ActivityManager.getPackageImportance()"
2016-10-25 22:41:00 +00:00
Jakub Pawlowski
bd7c33967c
Merge "Add helper method to convert Bluetooth UUID to bytes" am: 8a0a58b218 am: f169ecb76f am: f68a0c6dec
...
am: 94aaa0a705
2016-10-25 22:02:54 +00:00
TreeHugger Robot
f2ec2c1e42
Merge "Apply display override config for secondary displays"
2016-10-25 22:00:57 +00:00
Jakub Pawlowski
f68a0c6dec
Merge "Add helper method to convert Bluetooth UUID to bytes" am: 8a0a58b218
...
am: f169ecb76f
2016-10-25 21:54:44 +00:00
Jakub Pawlowski
f169ecb76f
Merge "Add helper method to convert Bluetooth UUID to bytes"
...
am: 8a0a58b218
2016-10-25 21:47:35 +00:00
TreeHugger Robot
942fde1415
Merge "Add the ability to postpone transitions."
2016-10-25 21:12:12 +00:00
Andreas Huber
35eb7994f8
Adds support for specifying the version of a service to register/lookup.
...
Bug: 32405011
Test: hidl_test_java
Change-Id: I91a31cafa68d570c67f9a1aa7efb9d3dcb35e591
2016-10-25 13:35:44 -07:00
Andrii Kulian
5406e7ade8
Apply display override config for secondary displays
...
Now display-specific settings, such as dimensions and orientation,
are stored in display override config. For default display it is
mirroring the global config. Each time when global config is updated,
override of the default display should be updated too and vice versa.
Test: Existing and manual tests still pass.
Change-Id: Ic6c2190092d328820f314a05bed43c875db18170
2016-10-25 13:22:10 -07:00
TreeHugger Robot
d80812b882
Merge "Optimize Fragment operations so that minimal work is done."
2016-10-25 19:33:27 +00:00
Jakub Pawlowski
f67ee83a22
Add helper method to convert Bluetooth UUID to bytes
...
Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb
2016-10-25 12:30:24 -07:00
Andreas Huber
fb7accfc83
Import android.hardware.thermal@1.0 constants into HardwarePropertiesManager.
...
Bug: 32200867
Test: make
Change-Id: I4e63e7c5431b33011b7c334077a5bd0c7edcf3a2
2016-10-25 09:43:38 -07:00
Andrew Scull
22851dbcb2
Merge "Refactor password metric computation."
2016-10-25 09:04:58 +00:00
Keisuke Kuroyanagi
c69f693216
Merge "Fix: Undo for drag and drop."
2016-10-25 01:24:18 +00:00
Keisuke Kuroyanagi
46ca471d25
Merge "Fix: Selection created by long tap and drag can be empty."
2016-10-25 01:20:22 +00:00
Dianne Hackborn
9df8f51044
Tweak ActivityManager.getPackageImportance()
...
- Now requires PACKAGE_USAGE_STATS permission.
- Simpler implementation.
Test: none
Change-Id: Id42ee31d0af8d896cbc94c81666bc734198c1273
2016-10-24 17:59:27 -07:00
Rob Carr
92c8ab1b07
Merge "Prevent crash from early Toast surface destruction."
2016-10-24 23:10:59 +00:00
TreeHugger Robot
03db8e4b58
Merge changes I1a544a8d,Ie78d3fb0
...
* changes:
IpConnectivityMetrics: rate limit ApfProgramEvents
IpConnectivityMetrics reads buffer size in settings
2016-10-24 14:45:46 +00:00
Hugo Benichi
e1c173d224
IpConnectivityMetrics: rate limit ApfProgramEvents
...
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).
Test: new test in IpConnectivityMetricsTest
Bug: 1550402
Change-Id: I1a544a8d62e6b02f0ed0088ab76c4bad338d2f44
2016-10-24 21:54:37 +09:00
Hugo Benichi
05686dbb6b
IpConnectivityMetrics reads buffer size in settings
...
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637
Change-Id: Ie78d3fb03cea7883585549dac4f2063f0a8d9f4b
2016-10-24 13:52:41 +09:00
Romain Guy
de0a3a893f
Add a half-precision floating point type
...
Denormals are fully supported.
This will be useful to store wide-gamut colors in a compact form
(a full RGBA color can be stored in a long using half floats for
each component).
Test: cts-tradefed run singleCommand cts-dev --module CtsUtilTestCases --test android.util.cts.HalfTest
Change-Id: I7e071edd2b66fdf6b375ce0e3e1a72ec3fb635b5
2016-10-22 02:26:32 -07:00
Robert Sesek
02bf0b6dbc
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546 am: f80fab010a
...
am: aa544e975e
2016-10-22 03:22:50 +00:00
Robert Sesek
aa544e975e
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546
...
am: f80fab010a
2016-10-22 03:17:15 +00:00
Robert Sesek
f80fab010a
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
...
am: 8be2850546
2016-10-22 03:12:18 +00:00
Treehugger Robot
8be2850546
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
2016-10-22 03:03:10 +00:00
Jeremy Joslin
807102d7ff
VPN network stat accounting changes. am: 3f0d75afe8
...
am: 0d309b7a47
2016-10-21 23:43:06 +00:00
Jeremy Joslin
0d309b7a47
VPN network stat accounting changes.
...
am: 3f0d75afe8
2016-10-21 23:37:57 +00:00
Siyamed Sinir
7984eb58be
Merge "Update TextView (set|get)(min|max)(width|height) ApiDoc"
2016-10-21 21:51:16 +00:00
Yin-Chia Yeh
3e254b6953
Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41 am: 50f9b6e71f
...
am: 0eb99d23b4
2016-10-21 21:28:21 +00:00
Vinod Krishnan
909bbd3117
Fwk: Only chime when docked and accessbility is on am: cf11ceab65
...
am: ccf3baf6c5
2016-10-21 21:21:18 +00:00
Yin-Chia Yeh
0eb99d23b4
Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41
...
am: 50f9b6e71f
2016-10-21 21:18:48 +00:00
Vinod Krishnan
ccf3baf6c5
Fwk: Only chime when docked and accessbility is on
...
am: cf11ceab65
2016-10-21 21:14:19 +00:00
Yin-Chia Yeh
50f9b6e71f
Merge "Camera2 Legacy: catch more surface abandoned error"
...
am: 03f14bef41
2016-10-21 21:07:44 +00:00
TreeHugger Robot
088f73a9e9
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
2016-10-21 20:41:10 +00:00
Yin-Chia Yeh
091661334b
Camera2 Legacy: catch more surface abandoned error
...
Bug: 30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
2016-10-21 11:40:46 -07:00
