Sudheer Shanka
0db053a33c
Merge "Clear leftover state between resolving calls."
2015-01-23 13:36:38 +00:00
Lorenzo Colitti
98dd474f47
am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
...
automerge: 5c9546b
2015-01-23 13:05:26 +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
Sudheer Shanka
7e64e109cd
Clear leftover state between resolving calls.
...
Because mOtherProfile variable was not cleared, we were directing
the user to the work intent resolved in the previous call, as well
as showing an extra item in the list.
Bug: 19070842
Change-Id: I48107c4914e7662d862ba4fe83368d65fc0c7966
2015-01-23 12:22:14 +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
f6483ac515
am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev automerge: 9ae7d49
...
automerge: 55055d6
2015-01-23 07:04:38 +00: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
e871f0176d
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3
...
automerge: 6840ffa
2015-01-23 06:10:48 +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
Brian Attwell
9ffad071a9
Unhide AggregationSuggestions.Builder
...
Additional unbundling from ContactsContract.
I'm going to remove all parameter types except name.
None of them have been implemented since they were
defined in ICS.
Bug: 18777272
Change-Id: I5c4066d1e933cc4ab18df06809687ee2b7eac91c
2015-01-23 01:54:30 +00:00
Eino-Ville Talvala
ac829206a9
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5 automerge: 0ec0465
...
automerge: 92baed1
2015-01-23 00:55:23 +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
Brian Attwell
09341baa8e
Merge "Revert "Expose ContentProviderOperation type""
2015-01-22 20:54:53 +00:00
Brian Attwell
8b89f0b207
Revert "Expose ContentProviderOperation type"
...
This reverts commit 9986f8e85a
2015-01-22 20:54:08 +00:00
Brian Attwell
a29ce2d47d
Merge "Expose ContentProviderOperation type"
2015-01-22 20:53:53 +00:00
Brian Attwell
9986f8e85a
Expose ContentProviderOperation type
...
CHANGE
isInsert, isDelete, isUpdate, isAssertQuery
JUSTIFICATION
The use of getType() in lots of unit tests means that
ContentProviderOperation#getType() can't practically be
removed.
Why not make it public? This allows 3p to use getType() in
unit tests. Plus it allows the unbundled contacts app
to continue using getType() in order to handle TYPE_INSERT
specially, without needing to awkwardly pass isInsert values
around.
Bug: 18777272
Change-Id: I3265193cda0c9405f6df896cd96a10df7225445a
2015-01-22 12:53:29 -08:00
Jeff Sharkey
2e5716417e
Public API for StrictMode cleartext detection.
...
Bug: 18335678
Change-Id: I4c3fd72303ae86f0c85f99ce9bdfd2913296a256
2015-01-22 11:53:43 -07:00
Ignacio Solla
3fed946aee
Merge "[WebView] Improve documentation around full screen mode."
2015-01-22 10:55:19 +00:00
Nicolas Prevot
8b5daa6be2
am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
...
automerge: 2cb240e
2015-01-22 10:37:56 +00:00
Ignacio Solla
7a4e18f8b8
[WebView] Improve documentation around full screen mode.
...
onShowCustomView and onHideCustomView are only used for full screen
support so we make that more explicit now (perhaps we should consider
rename and deprecate).
In M40 the WebView will also support full screen for non <video>
elements so we also consider that use case.
Change-Id: Ie4e245defbdd3e53bff98ac73305dd5e5e46334c
2015-01-22 10:35:07 +00:00
Nicolas Prevot
2cb240e083
am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
...
* commit '3677117d2bc8b703ccad4eff5914a61508922dd6':
Never set "Work" or "Personal apps" as prefered activities.
2015-01-22 10:32:30 +00:00
Nicolas Prevot
3677117d2b
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
...
automerge: ad44f74
2015-01-22 10:24:49 +00:00
Nicolas Prevot
ad44f7448f
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
2015-01-22 10:22:08 +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
8abb6d5e9f
am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49
...
automerge: 54dbd1f
2015-01-22 02:50:25 +00: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
bea29888c8
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev automerge: 0343e1a
...
automerge: 8379688
2015-01-22 00:09:28 +00: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
Alan Viverette
5e0908ac03
Merge "Ensure scroll drawables are managed correctly"
2015-01-21 23:57:51 +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
Dianne Hackborn
4da9bbbbd9
Merge "Bring back voice interaction APIs."
2015-01-21 23:45:55 +00:00
Alan Viverette
029d039ea5
Ensure scroll drawables are managed correctly
...
Bug: 19035677
Change-Id: Ib86666ddd1b6747f921a6e2f048405aba0c04ef7
2015-01-21 15:41:53 -08:00
Dianne Hackborn
4e106cedfe
Bring back voice interaction APIs.
...
Change-Id: I6039d7c0b188ac342441c56f7d19994b9a80ba17
2015-01-21 15:07:20 -08:00
Craig Mautner
7b15552692
Merge "Refactor removeApp and removeTask for last removals."
2015-01-21 22:19:25 +00:00
Craig Mautner
e3119b7d35
Refactor removeApp and removeTask for last removals.
...
Move app token removal to the AppWindowToken class so cleanup can
be done locally. Move task removal to the Task class so cleanup can
be done locally. Call task removal when the last app is removed.
Merge actions done prior to method calls into methods.
Fixes bug 18088522 item #12 .
Change-Id: I5ce85d2bb309ceb82bd7404e27a56a7c31cd7359
2015-01-21 13:57:24 -08:00
Jim Miller
b5db57a27d
Clarify getTrustAgentConfiguration() documentation.
...
Fixes bug 18983802
Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
2015-01-21 21:01:02 +00:00
Mike Lockwood
767cddd3dd
Merge "Watch for NumberFormatExceptions in AlsaCardsParser and AlsaDevicesParser"
2015-01-21 20:09:51 +00:00
