Jon Larimer
ac436d55fc
am feabeb62: am 8b8d6195: am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'feabeb624361c234279a03c6dcdb6a53ee48eddc':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 19:04:40 +00:00
Jon Larimer
ee7e1479f5
am 51ea897f: am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit '51ea897fca66c4042563a89f4593b9fd41f01b9d':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 19:04:37 +00:00
Jon Larimer
feabeb6243
am 8b8d6195: am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit '8b8d61952a4599439f3308a5f73bb0a2a0610563':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:57:20 +00:00
Jon Larimer
51ea897fca
am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit '470f3a98be8ecff3beca275c20b085da928e8943':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:57:17 +00:00
Jon Larimer
bebfd58604
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
automerge: ea63fd7
2015-01-29 18:55:25 +00:00
Jon Larimer
6fe42f0870
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
automerge: 48dad94
2015-01-29 18:54:16 +00:00
Scott Rowe
da0c5de5fa
docs: Card View for Android TV training
...
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
2015-01-29 10:50:25 -08:00
Jon Larimer
8b8d61952a
am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit '9570e144fe38a53c507838cc5234225c7a0da315':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:50:24 +00:00
Jon Larimer
470f3a98be
am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit '0a63d8176d8c3099c2e40bdbb00220f5aeeff69e':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:50:21 +00:00
Jon Larimer
1b5705386a
am 95b85c15: am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours
...
automerge: 3308ad4
2015-01-29 18:50:11 +00:00
Jon Larimer
3308ad42fa
am 95b85c15: am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours
...
* commit '95b85c1539c1569371ba0576da635e3e2557a433':
2015-01-29 18:47:54 +00:00
Jon Larimer
9570e144fe
am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:43:47 +00:00
Jon Larimer
0a63d8176d
am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:43:43 +00:00
Jon Larimer
143ac135dc
am 7a7d3a0e: am f9c96522: am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
...
* commit '7a7d3a0ee018e9309151b141ce472a47514877a2':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:40:15 +00:00
Jon Larimer
95b85c1539
am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours
...
* commit '9a2793e0ba11336b57457cde0d6dbc3628e853ed':
2015-01-29 18:40:14 +00:00
Jon Larimer
ea63fd7f9b
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit '88add68942694fc643518bcf5c26f6c3df7e9aa0':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:36:59 +00:00
Jon Larimer
48dad94919
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit 'a43742ec620cb11faffa2c2b1847dc1accce5736':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:36:55 +00:00
Jon Larimer
9a2793e0ba
am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours
...
* commit '074c11161aecb1e0e1fc2e5db5588ca5519e4b46':
2015-01-29 18:33:34 +00:00
Jon Larimer
88add68942
am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'a5ccca242747d59233ec5ecebc20d4a721e7850e':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:32:09 +00:00
Jon Larimer
a43742ec62
am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit '6813f29e3247f0567b77fe7eb451215b5fadf67b':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:32:05 +00:00
Jon Larimer
7a7d3a0ee0
am f9c96522: am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
...
* commit 'f9c9652256921eeb70484757f375aaa252f9c574':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:31:44 +00:00
Jon Larimer
074c11161a
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours
...
automerge: f8571c8a
2015-01-29 18:25:48 +00:00
Jon Larimer
a5ccca2427
am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:25:28 +00:00
Jon Larimer
6813f29e32
am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit '76cdbb0475fe881c8e7320c277e5ea4848be5bff':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:25:24 +00:00
Jon Larimer
f9c9652256
am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
...
* commit '6959a94f372d54e63f53b8cfc98b57ce4ab0866b':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:24:20 +00:00
John Reck
57998017ff
Allow ~Layer() to happen after onGLContextDestroyed
...
Bug: 19146354
Change-Id: I9e885936168bd541bfbed4064ad67ab524f58e32
2015-01-29 10:17:57 -08:00
Jon Larimer
6959a94f37
am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
...
* commit '336fc1fff793b2e5272f0b37cefe9ccf5dba5a53':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:14:44 +00:00
Jon Larimer
2982d64802
am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:12:01 +00:00
Jon Larimer
76cdbb0475
am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit 'd0318a63e51107d5589d8970b079c27d8f788c5a':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:11:57 +00:00
Jon Larimer
f8571c8a17
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
...
automerge: 7ab0ac6
2015-01-29 18:10:34 +00:00
Jon Larimer
336fc1fff7
am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
...
* commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:09:27 +00:00
Jon Larimer
7ab0ac6927
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
...
* commit '64d6bacf13e4ae913c52b773439a542dc5b2b714':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:02:27 +00:00
Jon Larimer
de9a76ed99
am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:00:58 +00:00
Jon Larimer
d0318a63e5
am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
...
* commit '7dd12d7633663c7f5802bdaaf8e7232a48aba811':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:00:55 +00:00
Jon Larimer
64d6bacf13
am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
...
* commit '2f4ad45d60aac5b2b025e9eac34e289d406645dc':
DO NOT MERGE Restore calling identity before checking permission
2015-01-29 17:55:10 +00:00
Jon Larimer
fc731e6e40
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
2015-01-29 17:48:58 +00:00
Jon Larimer
2f4ad45d60
Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
2015-01-29 17:48:24 +00:00
Jon Larimer
7dd12d7633
Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
2015-01-29 17:48:20 +00:00
Yang Ni
ebf63408d2
Pass in code cache directory when creating a script group.
...
Change-Id: Ia73ea917a126a5055ec97f13d90a5feaafd6a2f5
2015-01-29 08:46:46 -08:00
Lorenzo Colitti
d0cc544039
Also include the domain when parceling StaticIpConfiguration.
...
StaticIpConfiguration objects are parceled at least as part of the
IpConfiguration objects that are passed to IEthernetManager when an
application sets static IP configuration on Ethernet.
Change-Id: I49991e2f591cc6cf01b503c18eb343b5929efe29
2015-01-29 12:20:55 +00:00
tiger_huang
6b6838e967
Layout the window to be displayed if it would be resized
...
This patch fixes an issue which caused the resumed app to get the
wrong insets at first.
https://code.google.com/p/android/issues/detail?id=120421
Change-Id: I38c58121465372d1d66a7a98e386b0396d7d0f89
2015-01-29 19:54:12 +08:00
Lorenzo Colitti
bb150725ca
Merge "Support connecting to networks with misconfigured subnet masks." automerge: 106da5b
...
automerge: fb69689
2015-01-29 08:42:18 +00:00
Lorenzo Colitti
fb696894ee
Merge "Support connecting to networks with misconfigured subnet masks."
...
automerge: 106da5b
2015-01-29 08:37:58 +00:00
Lorenzo Colitti
106da5bf80
Merge "Support connecting to networks with misconfigured subnet masks."
2015-01-29 08:35:36 +00:00
Paul Jensen
b3b70975d9
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
...
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.
(cherry picked from commit c53113b37f
2015-01-29 17:12:35 +09:00
Lajos Molnar
df876a110c
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766
...
automerge: 2a8dc00
2015-01-29 08:02:53 +00:00
Lajos Molnar
2a8dc00eed
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev
...
automerge: 8514766
2015-01-29 07:58:56 +00:00
Lajos Molnar
8514766a0a
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev
2015-01-29 07:52:36 +00:00
Jinsuk Kim
c8aaaef20f
CEC: Do null/empty check against the parameter for checkRecordSource()
...
This prevents out-of-bound exception from occurring.
Bug: 19188370
Change-Id: I051dccf7760cb542ea3dc9b0adc9625fa2ad8b1f
2015-01-29 16:28:37 +09:00
Jinsuk Kim
b3bae9dc1a
am a6a01787: am 07600116: CEC: Ensure stable AVR connection
...
* commit 'a6a01787fb657189202dec096c30b3d2f63197dc':
CEC: Ensure stable AVR connection
2015-01-29 07:01:16 +00:00
