Svetoslav
9027d7355e
am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
...
automerge: 6e9f276
2015-01-23 22:30:46 +00:00
Svetoslav
6e9f276ff1
am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
...
* commit '42a13865a4527aaf907a6ced96f726b49b2cbbed':
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
2015-01-23 22:27:04 +00:00
Svetoslav
42a13865a4
Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
2015-01-23 22:22:18 +00:00
Chet Haase
f647cde899
am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
...
automerge: 458cc6a
2015-01-23 18:07:14 +00:00
Chet Haase
458cc6a515
am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
...
* commit 'af8c621d2165248cdb60699a6655e56e7dfa2e05':
Allow infinite-repeat zero-duration animators to continue repeating
2015-01-23 18:04:03 +00:00
Prerepa Viswanadham
34c32f4034
am 76552bb9: am e77adabe: Don\'t compute flags length for scan response
...
* commit '76552bb96398e03b21c7d88a302a6ffb59641c16':
Don't compute flags length for scan response
2015-01-23 18:01:54 +00:00
Chet Haase
af8c621d21
Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
2015-01-23 17:56:59 +00:00
Prerepa Viswanadham
76552bb963
am e77adabe: Don\'t compute flags length for scan response
...
* commit 'e77adabeafa16f9b401a6ad67405205bd96f2219':
Don't compute flags length for scan response
2015-01-23 17:56:28 +00:00
Prerepa Viswanadham
e77adabeaf
Don't compute flags length for scan response
...
Bug 19041626
Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
2015-01-23 17:51:43 +00:00
Lorenzo Colitti
5c9546b1da
am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
Support connecting to networks with misconfigured subnet masks.
2015-01-23 13:01:42 +00:00
Lorenzo Colitti
50f9d93a1c
am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
* commit 'ae38596bcf2a077753d170c0cad68f4dfde4277b':
Support connecting to networks with misconfigured subnet masks.
2015-01-23 12:56:58 +00:00
Lorenzo Colitti
ae38596bcf
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
2015-01-23 12:50:32 +00:00
Lorenzo Colitti
2dfb79a54a
Support connecting to networks with misconfigured subnet masks.
...
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.
Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
2015-01-23 21:10:34 +09:00
Jinsuk Kim
55055d690e
am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
...
automerge: 9ae7d49
2015-01-23 07:00:40 +00:00
Jinsuk Kim
9ae7d4975c
am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
...
* commit '76cf035513d843c66d2fafe85b6a37c4c19b9223':
CEC: Add logic to return to internal source
2015-01-23 06:56:24 +00:00
Jinsuk Kim
76cf035513
Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
2015-01-23 06:51:58 +00:00
Lorenzo Colitti
6840ffae67
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
...
automerge: fbaf6b3
2015-01-23 06:06:57 +00:00
Lorenzo Colitti
fbaf6b353d
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
...
* commit '78d51c2292b5a3b56be1b1e92bc67b70f4eebce4':
Use the proper IpPrefix and LinkAddress constructors in VPN code.
2015-01-23 06:03:46 +00:00
Lorenzo Colitti
78d51c2292
Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
2015-01-23 05:57:38 +00:00
Lorenzo Colitti
b205311456
Use the proper IpPrefix and LinkAddress constructors in VPN code.
...
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.
Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
2015-01-23 14:30:22 +09:00
Svetoslav
41fceb462b
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
...
In accessibility mode we calculate a point where to click in the accessibility
focused view as a bridge-gap solution before switching to accessibility click
actions. We cannot detect whether a view is covered by another one that consumes
all touch events, and therefore we may click on the wrong target. This was the
case with the toolbar. As a result a partially scrolled view in a scrollable
container covered by a toolbar cannot be activated and this is not an edge case.
bug:18986806
Change-Id: Ib41470c39806cec13e9b00b319879cd7f3412ab5
2015-01-22 18:51:47 -08:00
Chet Haase
d15e94f030
Allow infinite-repeat zero-duration animators to continue repeating
...
A recent change to ValueAnimator caused infinitely repeating animators with
duration 0 to be ended immediately. BatterySaver mode can cause animators
to have 0 duration, which means that apps depending on animator update events
no longer receive those events due to this behavior change.
The fix is to restore the previous behavior of allowing repeating animators
to continue, regardless of duration.
Issue #19113776 Fix infinite-repeating, zero-duration animator behavior
Change-Id: I4d1c7afb6d06ca45ef41db73c160f6a6d5754e24
2015-01-23 02:07:00 +00:00
Eino-Ville Talvala
92baed1212
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5
...
automerge: 0ec0465
2015-01-23 00:31:41 +00:00
Eino-Ville Talvala
0ec0465542
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
...
automerge: 7fde5e5
2015-01-23 00:08:32 +00:00
Eino-Ville Talvala
7fde5e5ba3
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
2015-01-23 00:05:26 +00:00
Jinsuk Kim
cb8661c08f
CEC: Add logic to return to internal source
...
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.
Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.
Bug: 19008579
Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
2015-01-22 16:58:26 +09:00
Jim Miller
54dbd1fd43
am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49
...
* commit '0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2':
Clarify getTrustAgentConfiguration() documentation.
2015-01-22 02:45:16 +00:00
Jim Miller
0ac8dfa37b
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
...
automerge: ffd1a49
2015-01-22 02:40:15 +00:00
Jim Miller
ffd1a49c0b
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
2015-01-22 02:37:39 +00:00
Eino-Ville Talvala
fa0b9a00b4
Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
...
Add missing implementation.
Also improve docs for flexible Surface sources.
Bug: 19076351
Change-Id: I1f1126a291480dcb68d3dd90825b5994e54dcc99
2015-01-21 16:49:59 -08:00
Robert Greenwalt
8379688475
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
...
automerge: 0343e1a
2015-01-21 23:59:09 +00:00
Robert Greenwalt
0343e1a704
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
...
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
Rerun entitlementcheck on sim change.
2015-01-21 23:56:02 +00:00
Robert Greenwalt
7ca16ff8c6
Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
2015-01-21 23:49:12 +00:00
Jim Miller
b5db57a27d
Clarify getTrustAgentConfiguration() documentation.
...
Fixes bug 18983802
Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
2015-01-21 21:01:02 +00:00
Dianne Hackborn
f6b4b1a432
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695
...
automerge: 5346a21#18201239 : ANRs in com.google.process.gapps:
2015-01-21 18:55:12 +00:00
Dianne Hackborn
5346a21bad
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev
...
automerge: 2132695#18201239 : ANRs in com.google.process.gapps:
2015-01-21 18:47:11 +00:00
Dianne Hackborn
455625e298
Work on issue #18201239 : ANRs in com.google.process.gapps:
...
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService
Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.
Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
2015-01-21 09:55:13 -08:00
Jinsuk Kim
00959a56e5
am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
...
automerge: 375ae7b
2015-01-20 23:47:44 +00:00
Jinsuk Kim
375ae7ba32
am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
...
* commit '054f2656a17a438aa6e8c8f6dcd61b1217f41b88':
Mark TimeUnit as @SystemApi
2015-01-20 22:43:34 +00:00
Jinsuk Kim
054f2656a1
Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
2015-01-20 22:39:53 +00:00
Jinsuk Kim
28d2a693ef
Mark TimeUnit as @SystemApi
...
Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
2015-01-21 07:33:40 +09:00
Neil Fuller
77e7f40116
am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."
...
* commit 'aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e':
Fix for broken docs build.
2015-01-20 15:29:55 +00:00
Neil Fuller
42c2ac00e6
Merge "Fix for broken docs build."
2015-01-20 15:18:59 +00:00
Neil Fuller
ae69120b0f
Fix for broken docs build.
...
Broken by commit 50a01d8960
2015-01-20 15:17:04 +00:00
Neil Fuller
7014da74e8
resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
...
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
2015-01-20 13:21:58 +00:00
Neil Fuller
00502e8960
Merge "Changes associated with an OkHttp upgrade"
2015-01-20 12:50:48 +00:00
Neil Fuller
50a01d8960
Changes associated with an OkHttp upgrade
...
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
2015-01-20 11:59:24 +00:00
Narayan Kamath
66bbfb6b2c
am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."
...
* commit '17f50f8119f4a8bdec304cde527f68ddd0b3bc0a':
Remove support for --classpath and make --runtime-init the default.
2015-01-19 15:21:30 +00:00
Narayan Kamath
f48029f00a
Remove support for --classpath and make --runtime-init the default.
...
--classpath hasn't been properly supported or used for as long as
git history exists, and the non --runtime-init classpath is useless
without it.
Also, forking and exec' a bare dalvikvm instance from the zygote seems
somewhat pointless since we might as well just execute it directly.
Change-Id: Ib07d822d448e7b431d7564381f9cd11735fd1113
2015-01-19 15:04:58 +00:00
Svet Ganov
605ba80277
am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
...
* commit '2004fdf8e54daa84a8c4da20909f81f37add66d5':
Fixing a memory leak: activities are leaked.
2015-01-16 22:25:01 +00:00
