OSDN Git Service
Jon Larimer [Thu, 29 Jan 2015 19:56:40 +0000 (19:56 +0000)]
am
eb56f7a5: am
4c2a6fdd: am
64bdf77d: am
8bb65246: 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 -s ours automerge:
6fe42f0 -s o
* commit '
eb56f7a5dc66cb0ca54afd25a9d089e7931512df':
Jon Larimer [Thu, 29 Jan 2015 19:51:05 +0000 (19:51 +0000)]
am
4c2a6fdd: am
64bdf77d: am
8bb65246: 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 -s ours automerge:
6fe42f0 -s ours
* commit '
4c2a6fddb10a8b4c00391d54371aaa14f5d901ce':
Jon Larimer [Thu, 29 Jan 2015 19:45:56 +0000 (19:45 +0000)]
am
64bdf77d: am
8bb65246: 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 -s ours automerge:
6fe42f0 -s ours
* commit '
64bdf77d9515f587f31998b614e524c26b2415a4':
Jon Larimer [Thu, 29 Jan 2015 19:38:48 +0000 (19:38 +0000)]
am
8bb65246: 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 -s ours automerge:
6fe42f0 -s ours
* commit '
8bb65246f2655fae8d807db973c5eaeff78733cc':
Jon Larimer [Thu, 29 Jan 2015 19:29:31 +0000 (19:29 +0000)]
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 -s ours
automerge:
6fe42f0 -s ours
* commit '
6fe42f08702a0773c0dd2aad2d41c54f73bb057b':
Jon Larimer [Thu, 29 Jan 2015 19:09:05 +0000 (19:09 +0000)]
am
ac436d55: 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 '
ac436d55fc128797f57f674541c6e77dd44b7416':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 19:09:00 +0000 (19:09 +0000)]
am
ee7e1479: 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 '
ee7e1479f59aeb41aa54ae7e88dd5adb4f454615':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 19:04:40 +0000 (19:04 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 19:04:37 +0000 (19:04 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:57:20 +0000 (18:57 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:57:17 +0000 (18:57 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:54:16 +0000 (18:54 +0000)]
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 -s ours
* commit '
48dad94919c9f5027559feed3b05d8d01a03f687':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:50:24 +0000 (18:50 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:50:21 +0000 (18:50 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:50:11 +0000 (18:50 +0000)]
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 -s ours
* commit '
3308ad42fa162fbdda26337f64e00603b1388ec7':
Jon Larimer [Thu, 29 Jan 2015 18:47:54 +0000 (18:47 +0000)]
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':
Jon Larimer [Thu, 29 Jan 2015 18:43:47 +0000 (18:43 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:43:43 +0000 (18:43 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:40:15 +0000 (18:40 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:40:14 +0000 (18:40 +0000)]
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':
Jon Larimer [Thu, 29 Jan 2015 18:36:59 +0000 (18:36 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:36:55 +0000 (18:36 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:33:34 +0000 (18:33 +0000)]
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':
Jon Larimer [Thu, 29 Jan 2015 18:32:09 +0000 (18:32 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:32:05 +0000 (18:32 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:31:44 +0000 (18:31 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:25:48 +0000 (18:25 +0000)]
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 '
f8571c8a170f0cb8341b3e2adda306bb709b824a':
Jon Larimer [Thu, 29 Jan 2015 18:25:28 +0000 (18:25 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:25:24 +0000 (18:25 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:24:20 +0000 (18:24 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:14:44 +0000 (18:14 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:12:01 +0000 (18:12 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:11:57 +0000 (18:11 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:10:34 +0000 (18:10 +0000)]
am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
automerge:
7ab0ac6 -s ours
* commit '
7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:09:27 +0000 (18:09 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:02:27 +0000 (18:02 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:00:58 +0000 (18:00 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:00:55 +0000 (18:00 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 17:55:10 +0000 (17:55 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 17:48:57 +0000 (17:48 +0000)]
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
Jon Larimer [Thu, 29 Jan 2015 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
Jon Larimer [Thu, 29 Jan 2015 17:48:14 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
Lorenzo Colitti [Thu, 29 Jan 2015 08:42:18 +0000 (08:42 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks." automerge:
106da5b
automerge:
fb69689
* commit '
fb696894ee24ffee3135f4bc460afa84f23efaeb':
Support connecting to networks with misconfigured subnet masks.
Lorenzo Colitti [Thu, 29 Jan 2015 08:37:58 +0000 (08:37 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks."
automerge:
106da5b
* commit '
106da5bf80d182a2e6fd346e1836ae4fc0ba1d92':
Support connecting to networks with misconfigured subnet masks.
Lorenzo Colitti [Thu, 29 Jan 2015 08:35:35 +0000 (08:35 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks."
Lajos Molnar [Thu, 29 Jan 2015 08:02:53 +0000 (08:02 +0000)]
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge:
8514766
automerge:
2a8dc00
* commit '
2a8dc00eedeb2b8a9fa3560d8afa4cfd7c17d395':
ImageReader: add support for compatible flexYUV buffers
Lajos Molnar [Thu, 29 Jan 2015 07:58:56 +0000 (07:58 +0000)]
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev
automerge:
8514766
* commit '
8514766a0a388c3598eaa64709edc634f8edccb1':
ImageReader: add support for compatible flexYUV buffers
Lajos Molnar [Thu, 29 Jan 2015 07:52:35 +0000 (07:52 +0000)]
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev
Jinsuk Kim [Thu, 29 Jan 2015 07:01:16 +0000 (07:01 +0000)]
am
a6a01787: am
07600116: CEC: Ensure stable AVR connection
* commit '
a6a01787fb657189202dec096c30b3d2f63197dc':
CEC: Ensure stable AVR connection
Jinsuk Kim [Thu, 29 Jan 2015 07:01:11 +0000 (07:01 +0000)]
am
f4e4eb54: am
2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low
* commit '
f4e4eb5401135fdc374d83317771ed87d1caeb86':
CEC: Stop ARC if hotplug event is asserted low
Jinsuk Kim [Thu, 29 Jan 2015 06:55:26 +0000 (06:55 +0000)]
am
0cbbfb2b: am
7640d989: CEC: Fix a regression bug
* commit '
0cbbfb2beab0cf63521e59904db31661a4832531':
CEC: Fix a regression bug
Jinsuk Kim [Thu, 29 Jan 2015 06:55:19 +0000 (06:55 +0000)]
am
5e34b6b9: am
43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
* commit '
5e34b6b9af93a50354a31f900455ec24e79c2528':
CEC: Let <Active Source> from the active source work
Jinsuk Kim [Thu, 29 Jan 2015 06:54:15 +0000 (06:54 +0000)]
am
07600116: CEC: Ensure stable AVR connection
* commit '
07600116b59e2accd1e95b9029c2c9819cd76c5a':
CEC: Ensure stable AVR connection
Jinsuk Kim [Thu, 29 Jan 2015 06:54:11 +0000 (06:54 +0000)]
am
2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low
* commit '
2ee0d6f44d7274bb1846cc6ff7a60451539a2b51':
CEC: Stop ARC if hotplug event is asserted low
Jinsuk Kim [Wed, 28 Jan 2015 22:34:34 +0000 (07:34 +0900)]
CEC: Ensure stable AVR connection
Make sure AVR device removal due to hotplug detection failure occur
in a less strict manner - doing it only if the failure is detected
3 times in a row.
Bug:
19171321
Change-Id: I1479663b05cdc957cc52123799c756f6b74f6708
Jinsuk Kim [Thu, 29 Jan 2015 06:46:43 +0000 (06:46 +0000)]
am
7640d989: CEC: Fix a regression bug
* commit '
7640d9895cf8fae7a99a7db5bba0079ba6022621':
CEC: Fix a regression bug
Jinsuk Kim [Thu, 29 Jan 2015 06:46:39 +0000 (06:46 +0000)]
am
43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
* commit '
43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1':
CEC: Let <Active Source> from the active source work
Jinsuk Kim [Wed, 28 Jan 2015 08:38:28 +0000 (17:38 +0900)]
CEC: Stop ARC if hotplug event is asserted low
Updated to stop ARC as specified in HEAC 2.4 transmission condition.
Bug:
19170947
Change-Id: Ibf797ce3b49f32561ef0c36b6874e7ebe19ed65a
Jinsuk Kim [Wed, 28 Jan 2015 07:44:07 +0000 (16:44 +0900)]
CEC: Fix a regression bug
The HdmiControlService.getActiveSource() has a regression (exception)
when calling getDeviceInfoByPath since method should be called on
a service thread. Introduced a method that can be invoked safely
from the main thread.
Bug:
19170884
Change-Id: I393161e08c916270faf46147a97076bc573b808f
Jinsuk Kim [Thu, 29 Jan 2015 06:40:46 +0000 (06:40 +0000)]
Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
vandwalle [Thu, 29 Jan 2015 05:00:44 +0000 (05:00 +0000)]
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge:
d169839
automerge:
0a22d43
* commit '
0a22d43c9143475c889ce54f0de6261e8857ab9d':
aggressively blacklist WifiConfiguration for the purpose of switching network
vandwalle [Thu, 29 Jan 2015 04:57:00 +0000 (04:57 +0000)]
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev
automerge:
d169839
* commit '
d1698393e71f4792f98156bb963e5876bc8c2eb0':
aggressively blacklist WifiConfiguration for the purpose of switching network
vandwalle [Thu, 29 Jan 2015 04:50:42 +0000 (04:50 +0000)]
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev
Stuart Scott [Thu, 29 Jan 2015 02:06:51 +0000 (02:06 +0000)]
am
8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge:
f4e5236
* commit '
8d702000a7291068e639a9954e03c36d66144449':
Change getDeviceId to take phoneId.
Stuart Scott [Thu, 29 Jan 2015 01:58:53 +0000 (01:58 +0000)]
Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
automerge:
f4e5236
* commit '
f4e52360613d20dc8176ce8a37cb05ad904fad0d':
Change getDeviceId to take phoneId.
Stuart Scott [Thu, 29 Jan 2015 01:55:46 +0000 (01:55 +0000)]
Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
Lajos Molnar [Fri, 23 Jan 2015 03:03:31 +0000 (19:03 -0800)]
ImageReader: add support for compatible flexYUV buffers
Bug:
17906609
Change-Id: Ia21aff632b9a92f4e391b3917a7774af46fd81a0
Dirk Dougherty [Thu, 29 Jan 2015 01:11:14 +0000 (01:11 +0000)]
am
820d5c52: am
8b1ad8e4: am
49738792: Doc change: Update Ads terms language. automerge:
3f9d57d automerge:
e0b5a38
* commit '
820d5c52b7e65bffeb4291887f5a1011e7ce971e':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 01:01:32 +0000 (01:01 +0000)]
am
8b1ad8e4: am
49738792: Doc change: Update Ads terms language. automerge:
3f9d57d
automerge:
e0b5a38
* commit '
e0b5a3812269228070dabb792bc501ae435338bb':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 00:54:45 +0000 (00:54 +0000)]
am
8b1ad8e4: am
49738792: Doc change: Update Ads terms language.
automerge:
3f9d57d
* commit '
3f9d57dbe896d56e0eae381aa3e70ac93d755f24':
Doc change: Update Ads terms language.
Jae Seo [Thu, 29 Jan 2015 00:46:25 +0000 (00:46 +0000)]
am
4b1e5814: am
71191442: TIF: Do not call session callbacks when the session is already released
* commit '
4b1e5814d18dae8f2581cf702da4b4e1de0c3eb4':
TIF: Do not call session callbacks when the session is already released
Jae Seo [Thu, 29 Jan 2015 00:33:29 +0000 (00:33 +0000)]
am
71191442: TIF: Do not call session callbacks when the session is already released
* commit '
711914421896ad15ab3c944c3adc838ac67cf2a6':
TIF: Do not call session callbacks when the session is already released
Dirk Dougherty [Thu, 29 Jan 2015 00:30:37 +0000 (00:30 +0000)]
am
8b1ad8e4: am
49738792: Doc change: Update Ads terms language.
* commit '
8b1ad8e4d148b70e31d675515e8ad24ca3d12169':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 29 Jan 2015 00:24:39 +0000 (00:24 +0000)]
am
49738792: Doc change: Update Ads terms language.
* commit '
497387928d53cca060c3f43b3a9f5c7834564333':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 6 Nov 2014 18:58:06 +0000 (10:58 -0800)]
Doc change: Update Ads terms language.
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
Jae Seo [Wed, 28 Jan 2015 23:50:08 +0000 (15:50 -0800)]
TIF: Do not call session callbacks when the session is already released
Bug:
19146382
Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd
Eino-Ville Talvala [Wed, 28 Jan 2015 23:29:23 +0000 (23:29 +0000)]
am
06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge:
a17ab21
* commit '
06b1014cf28431706d42219549170896bd581a29':
Camera2 legacy: Do not advertise NV21 support.
Eino-Ville Talvala [Wed, 28 Jan 2015 23:22:56 +0000 (23:22 +0000)]
Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
automerge:
a17ab21
* commit '
a17ab21d4c81ecc80b00b14fe56ce721b4e757ae':
Camera2 legacy: Do not advertise NV21 support.
Eino-Ville Talvala [Wed, 28 Jan 2015 23:20:00 +0000 (23:20 +0000)]
Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
xinhe [Wed, 28 Jan 2015 21:53:34 +0000 (21:53 +0000)]
am
93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge:
fc921d1
* commit '
93487e286e6bfa434fb092c6276d96b40e5d62c4':
Sprint: MMS cannot be sent in the UK
xinhe [Wed, 28 Jan 2015 21:45:25 +0000 (21:45 +0000)]
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
automerge:
fc921d1
* commit '
fc921d19b6d6d26f3b0147ba9c1ee96298e6a17c':
Sprint: MMS cannot be sent in the UK
xinhe [Wed, 28 Jan 2015 21:42:14 +0000 (21:42 +0000)]
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
Jose Lima [Wed, 28 Jan 2015 21:27:33 +0000 (21:27 +0000)]
am
4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge:
1f81973
* commit '
4a40f7cc90d8f908527d2cfff32376ee51259250':
Fix crash caused by disabling the Options panel on TVs
Leon Scroggins III [Wed, 28 Jan 2015 21:27:15 +0000 (21:27 +0000)]
Stuart Scott [Wed, 28 Jan 2015 20:35:43 +0000 (12:35 -0800)]
Change getDeviceId to take phoneId.
bug:
18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
Jose Lima [Wed, 28 Jan 2015 20:59:05 +0000 (20:59 +0000)]
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
automerge:
1f81973
* commit '
1f81973e7d33f2a3f4b0a0e232854283f0f18030':
Fix crash caused by disabling the Options panel on TVs
Eino-Ville Talvala [Wed, 28 Jan 2015 20:55:12 +0000 (12:55 -0800)]
Camera2 legacy: Do not advertise NV21 support.
Also reduce logging somewhat for common scenarios.
Bug:
19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27
Jose Lima [Wed, 28 Jan 2015 20:55:51 +0000 (20:55 +0000)]
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
Leon Scroggins III [Wed, 28 Jan 2015 19:13:55 +0000 (19:13 +0000)]
Leon Scroggins III [Wed, 28 Jan 2015 19:09:08 +0000 (19:09 +0000)]
Jose Lima [Wed, 28 Jan 2015 18:43:15 +0000 (10:43 -0800)]
Fix crash caused by disabling the Options panel on TVs
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.
Bug:
19178531
Bug:
18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
xinhe [Wed, 28 Jan 2015 18:40:27 +0000 (10:40 -0800)]
Sprint: MMS cannot be sent in the UK
This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.
Bug:
18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
Leon Scroggins III [Wed, 28 Jan 2015 18:32:20 +0000 (18:32 +0000)]
Leon Scroggins III [Wed, 28 Jan 2015 18:23:47 +0000 (18:23 +0000)]
Bryce Lee [Wed, 28 Jan 2015 17:58:41 +0000 (17:58 +0000)]
am
2a8ccd4b: am
1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
* commit '
2a8ccd4b1f82086f6e38ec32ad084306400dcf93':
Revert "Make THEATER_MODE_ON setting a system api."
John Spurlock [Wed, 28 Jan 2015 17:58:35 +0000 (17:58 +0000)]
am
4b41400b: am
e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
* commit '
4b41400b60d57f23b16702540b9d50f98aeeffb7':
Default "pickup peforms proximity check" to false.
Bryce Lee [Wed, 28 Jan 2015 17:52:59 +0000 (17:52 +0000)]
am
1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
* commit '
1061652a37e18683c994f9d4b872ecf990125a05':
Revert "Make THEATER_MODE_ON setting a system api."
John Spurlock [Wed, 28 Jan 2015 17:52:48 +0000 (17:52 +0000)]
am
e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
* commit '
e2f4ab930fa4526cf989624356051b99008c23a6':
Default "pickup peforms proximity check" to false.
Bryce Lee [Wed, 28 Jan 2015 17:50:38 +0000 (17:50 +0000)]
Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
John Spurlock [Wed, 28 Jan 2015 17:48:12 +0000 (17:48 +0000)]
Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
OSDN Git Service
