Chet Haase
f647cde899
am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
...
automerge: 458cc6a
* commit '458cc6a51567677e8a4d1012d3ac89ae57c4daf7':
Allow infinite-repeat zero-duration animators to continue repeating
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
Rich Slogar
639248789c
docs: plugin for gradle typo
...
b/19106103
Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
2015-01-23 09:57:37 -08: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
Benjamin Franz
f87b174dac
Avoid NullPointerException if createUser returns null
...
If createUser returns null, we run into a NullPointerException
in createAndInitializeUser. This can happen when the policy
DISALLOW_ADD_USER is set.
Bug: 19121141
Change-Id: Id4bda832a243fa42c31eb5a176ecaa248aee68f5
2015-01-23 17:04:16 +00:00
Christoph Studer
b97b519808
am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev
...
automerge: 9e9885e
* commit '9e9885e1c0b34a6284235e61b023013c1ded6468':
SysUI: Don't drop HUN notification when clicked
2015-01-23 17:00:00 +00:00
Christoph Studer
9e9885e1c0
am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev
...
* commit '73500edb42d9270437e41ff2ddaa0cd6eacb422b':
SysUI: Don't drop HUN notification when clicked
2015-01-23 16:55:31 +00:00
Christoph Studer
73500edb42
Merge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev
2015-01-23 16:51:46 +00:00
Benjamin Franz
07b87e537d
am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
...
* commit 'bfca5f40eb9e5d888218c615fa744e5d8ea2d207':
Avoid SecurityException when calling getUserData
2015-01-23 14:42:38 +00:00
Benjamin Franz
bfca5f40eb
am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
...
* commit '266303fdb02ca1cf6df348e1af6830675476fd78':
Avoid SecurityException when calling getUserData
2015-01-23 14:37:42 +00:00
Benjamin Franz
266303fdb0
Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
2015-01-23 14:33:06 +00:00
Zoltan Szatmary-Ban
871fa7343a
Ensure notifications are sent when locking/unlocking location share
...
When the restriction 'DISALLOW_SHARE_LOCATION' is applied or removed on a user
it is important to send out notifications to content observers of
LOCATION_PROVIDERS_ALLOWED.
Bug: 18995405
Change-Id: I8b3910a423a012ea9d15470eec101723c9f0eaf7
2015-01-23 14:08:30 +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
Narayan Kamath
c2d5128039
Merge "Remove superfluous OpenSSL include paths." automerge: fe24754
...
automerge: d555cd5
* commit 'd555cd550d634192e96e3b834f91aa9559a259db':
Remove superfluous OpenSSL include paths.
2015-01-23 10:54:44 +00:00
Narayan Kamath
d555cd550d
Merge "Remove superfluous OpenSSL include paths."
...
automerge: fe24754
* commit 'fe24754fd69e75829c748b56e5806f1603835db9':
Remove superfluous OpenSSL include paths.
2015-01-23 10:50:41 +00:00
Narayan Kamath
fe24754fd6
Merge "Remove superfluous OpenSSL include paths."
2015-01-23 10:47:34 +00:00
Jinsuk Kim
c4228a7281
CEC: Handles initiation of press-and-hold correctly
...
Previously the time gap between the first and the second key event
for repeated keys(press-and-hold) can be bigger than the threshold,
which violates CEC spec. This CL rectifies it by managing its own
state rather than relying on Android key handler.
Bug: 19117830
Change-Id: Iedfa48f9ab826252e8616d1c3b7491e8b8333c81
2015-01-23 18:20:20 +09:00
Jinsuk Kim
304f696b34
am 3379c1cb: Fix broken build
...
automerge: 2652c57
* commit '2652c57257416f088de3e5b359f36a63e3cbe91d':
Fix broken build
2015-01-23 08:23:27 +00:00
Jinsuk Kim
2652c57257
am 3379c1cb: Fix broken build
...
* commit '3379c1cb62488393c2c49b5f38483656c7175fa1':
Fix broken build
2015-01-23 08:19:56 +00:00
Jinsuk Kim
3379c1cb62
Fix broken build
...
Updated system-current.txt
Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
2015-01-23 17:13:50 +09:00
Jinsuk Kim
55055d690e
am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
...
automerge: 9ae7d49
* commit '9ae7d4975ce471a7b295282ca999cb20a6cbb273':
CEC: Add logic to return to internal source
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
* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
Use the proper IpPrefix and LinkAddress constructors in VPN code.
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
Matthew Xie
c525cf7a33
Delay the second message for 30ms more than the last message for a2dp
...
In function setBluetoothA2dpDeviceConnectionState, current code calculate
the delay of the second state update message to be exactly the same as the
last delayed messages. This causes a problem that the sequence of the
messages may be altered.
Bug: 19036411
Change-Id: I35762873fd3341ec098dd229ac96bd42d6f34195
2015-01-22 20:54:54 -08: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
Adam Lesinski
e03f2cb2c2
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge: b443610
...
automerge: 83f58a2
* commit '83f58a2f7afac98199536b3090fe6f767ffb3a0d':
AAPT: Use the right enum when checking for density configurations
2015-01-23 02:46:32 +00:00
Adam Lesinski
83f58a2f7a
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev
...
automerge: b443610
* commit 'b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43':
AAPT: Use the right enum when checking for density configurations
2015-01-23 02:36:39 +00:00
Adam Lesinski
b443610bcb
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev
2015-01-23 02:29:50 +00:00
Adam Lesinski
ed643e8182
AAPT: Use the right enum when checking for density configurations
...
Bug:19116675
Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
2015-01-22 18:19:44 -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
Rich Slogar
78f75b29fa
docs: remove + annotations in version references
...
b/18417182
Change-Id: I16181a4ebb7a4ac40a7307438e120489b806f24e
2015-01-22 17:48:43 -08:00
Sanket Padawe
b6b29ba45a
Remove entries from config_tether_apndata for some carriers.
...
+ Remove entries from config_tether_apndata when primary carrier requires
DUN apn and the mvno does not.
Bug: 19006861
Change-Id: Idf93fe2302662ce2b25e72277080bbc9d410b2de
2015-01-22 17:43:08 -08:00
Adam Langley
0e7829e428
Remove superfluous OpenSSL include paths.
...
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Change-Id: I467f1b1d038b5136fa22b1230da134c394eac54e
2015-01-22 17:15:13 -08:00
Eino-Ville Talvala
92baed1212
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5
...
automerge: 0ec0465
* commit '0ec0465542ba41634ed13dd6bae2eca6afa62d4a':
Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
2015-01-23 00:31:41 +00:00
Eino-Ville Talvala
0ec0465542
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
...
automerge: 7fde5e5
* commit '7fde5e5ba3d306bc694e2b97edf5892755fcb6d0':
Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
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
Craig Mautner
b978450b1c
Merge "Even more debug for bug 17721767." into lmp-mr1-dev automerge: dbabf37
...
automerge: 5cb31f2
* commit '5cb31f2179c70152f94bcb8309449fc2e7bed63a':
Even more debug for bug 17721767.
2015-01-22 23:37:51 +00:00
Craig Mautner
5cb31f2179
Merge "Even more debug for bug 17721767." into lmp-mr1-dev
...
automerge: dbabf37
* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
Even more debug for bug 17721767.
2015-01-22 23:24:11 +00:00
Craig Mautner
dbabf37fd3
Merge "Even more debug for bug 17721767." into lmp-mr1-dev
2015-01-22 23:17:47 +00:00
Craig Mautner
de313753d0
Even more debug for bug 17721767.
...
This time adding events for stack movement and focus change.
Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
2015-01-22 14:28:03 -08:00