OSDN Git Service
Mike Lockwood [Thu, 29 Jan 2015 21:33:30 +0000 (21:33 +0000)]
Merge "UsbAlsaManager: Don't reselect current USB audio device on all USB disconnects"
Mike Lockwood [Thu, 29 Jan 2015 21:15:07 +0000 (21:15 +0000)]
Merge "MidiManager: Add USB peripheral MIDI support"
Mike Lockwood [Fri, 19 Sep 2014 18:16:52 +0000 (11:16 -0700)]
MidiManager: Add USB peripheral MIDI support
This allows the android device to appear as a USB MIDI device to
a USB host (like a Mac or a PC) using the f_midi USB gadget driver.
Change-Id: I14f1ba73bcce2c894e77efb8810beac4ffe246d8
John Reck [Thu, 29 Jan 2015 20:53:38 +0000 (12:53 -0800)]
resolved conflicts for merge of
fe5ac4fc to master
Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b
John Reck [Thu, 29 Jan 2015 20:28:08 +0000 (20:28 +0000)]
am
5f3e21ce: am
6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
* commit '
5f3e21cebeecf042e8e18a5021b3965415d9ff60':
Allow ~Layer() to happen after onGLContextDestroyed
John Reck [Thu, 29 Jan 2015 20:18:58 +0000 (20:18 +0000)]
am
6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
* commit '
6efc3ac6d2094c72b6a2e288101a5349b017274d':
Allow ~Layer() to happen after onGLContextDestroyed
John Reck [Thu, 29 Jan 2015 20:13:04 +0000 (20:13 +0000)]
Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
Jon Larimer [Thu, 29 Jan 2015 20:03:25 +0000 (20:03 +0000)]
am
3ac22f7a: am
49127bdd: am
0312d2ff: am
320f505e: am
52fba8d1: 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 automerge:
bebfd58
* commit '
3ac22f7a386317ed4affe5bca0406501726ddb73':
Jon Larimer [Thu, 29 Jan 2015 20:03:21 +0000 (20:03 +0000)]
am
ca04fca5: (-s ours) 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:
* commit '
ca04fca501aa1b3ca979bd860bb722ba3e3e0662':
Jon Larimer [Thu, 29 Jan 2015 19:56:45 +0000 (19:56 +0000)]
am
49127bdd: am
0312d2ff: am
320f505e: am
52fba8d1: 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 automerge:
bebfd58
* commit '
49127bddaf29c725f0cbdfe53f33e37afdd3da9f':
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:08 +0000 (19:51 +0000)]
am
0312d2ff: am
320f505e: am
52fba8d1: 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 automerge:
bebfd58
* commit '
0312d2ff45d895260f0995fc784bea706bd4f13d':
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:46:00 +0000 (19:46 +0000)]
am
320f505e: am
52fba8d1: 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 automerge:
bebfd58
* commit '
320f505ed52f8970b08eb93766af831de0332415':
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:51 +0000 (19:38 +0000)]
am
52fba8d1: 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 automerge:
bebfd58
* commit '
52fba8d13428665fde405ef91857c00f0d399610':
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:30:57 +0000 (19:30 +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 automerge:
ea63fd7
automerge:
bebfd58
* commit '
bebfd58604ae8a70c08056f3a5cd9289b27fe11c':
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:13:06 +0000 (19:13 +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
automerge:
04ac1ad
* commit '
04ac1ad29b7148eb1c35a2c73ff1f9c68ed9fd84':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 19:11:37 +0000 (19:11 +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
automerge:
fd9ba59 -s ours
* commit '
fd9ba59c62c0f1d94cf2c015620b7beb55583eb9':
DO NOT MERGE Restore calling identity before checking permission
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:56:29 +0000 (18:56 +0000)]
am
1b570538: (-s ours) 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 '
1b5705386aed3135526ffe7c3f7b460ad944bcb3':
Jon Larimer [Thu, 29 Jan 2015 18:55:25 +0000 (18:55 +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
automerge:
ea63fd7
* commit '
ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
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:48:55 +0000 (18:48 +0000)]
am
143ac135: (-s ours) 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 '
143ac135dcf85b899ae387be2f13401ecd43f08b':
DO NOT MERGE Restore calling identity before checking permission
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
Mike Lockwood [Thu, 29 Jan 2015 18:39:48 +0000 (10:39 -0800)]
UsbAlsaManager: Don't reselect current USB audio device on all USB disconnects
Change-Id: I4d3a0d803a6d1eb02ff48a7e8587a1ff6c66a500
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':
Alan Viverette [Thu, 29 Jan 2015 18:37:37 +0000 (18:37 +0000)]
Merge "Clear accessibility focus when the window loses visibility"
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
John Reck [Thu, 29 Jan 2015 18:17:57 +0000 (10:17 -0800)]
Allow ~Layer() to happen after onGLContextDestroyed
Bug:
19146354
Change-Id: I9e885936168bd541bfbed4064ad67ab524f58e32
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
Derek Sollenberger [Thu, 29 Jan 2015 17:43:59 +0000 (17:43 +0000)]
Merge "Fix bitmap allocation error that causes crash when calling Bitmap::extractAlpha"
Mike Lockwood [Thu, 29 Jan 2015 17:11:54 +0000 (17:11 +0000)]
Merge "MIDI Manager: Remove message packetization from MIDI transport"
Mike Lockwood [Tue, 27 Jan 2015 19:47:43 +0000 (11:47 -0800)]
MIDI Manager: Remove message packetization from MIDI transport
Instead of attempting to package exactly one MIDI message in each call to
MidiReceiver.onPost(), we now pass messages as a raw stream of bytes.
This means we may now receive multiple MIDI messages in MidiReceiver.onPost().
We make this change to avoid the complexity of taking the single message approach
with SysEx and realtime messages. This shifts some of the burden of parsing
MIDI messages to the client application. But the parsing is best handled in the
application anyway, rather than having the framework impose its own policy
on how the messages are parsed.
Change-Id: Idb6c200037f827cc618bc7d9455a7aa864b494a7
Derek Sollenberger [Thu, 29 Jan 2015 16:22:55 +0000 (11:22 -0500)]
Fix bitmap allocation error that causes crash when calling Bitmap::extractAlpha
bug:
19112656
Change-Id: Ib44ba4208449d5873402e9516abc8b6d8fa0b82a
Jason Monk [Wed, 7 Jan 2015 17:07:06 +0000 (12:07 -0500)]
Fix SysUI tests to pass.
Most were fixed by including the correct subscription id in the
broadcast.
The last was testing based on SIM card state which is not something
the MobileSignalControllers track anymore so I just pulled it out
completely.
Change-Id: Ie52068a3c8f8652f1b0641e6376696aeddda26a2
Lorenzo Colitti [Thu, 29 Jan 2015 08:46:07 +0000 (08:46 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks." automerge:
106da5b automerge:
fb69689
automerge:
bb15072
* commit '
bb150725ca5b0998c06c5e34b774a78e8d74b0f5':
Support connecting to networks with misconfigured subnet masks.
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:06:48 +0000 (08:06 +0000)]
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge:
8514766 automerge:
2a8dc00
automerge:
df876a1
* commit '
df876a110c4b6d55b4a9df57621aa38ff06c6de8':
ImageReader: add support for compatible flexYUV buffers
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:18:36 +0000 (07:18 +0000)]
am
a6a01787: am
07600116: CEC: Ensure stable AVR connection
automerge:
b3bae9d
* commit '
b3bae9dc1a649eb326d17c2035c0f567b797edf3':
CEC: Ensure stable AVR connection
Jinsuk Kim [Thu, 29 Jan 2015 07:17:09 +0000 (07:17 +0000)]
am
f4e4eb54: am
2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low
automerge:
6da2c66
* commit '
6da2c666d258a0ac3d65b867d7443a3e3f8cded0':
CEC: Stop ARC if hotplug event is asserted low
Jinsuk Kim [Thu, 29 Jan 2015 07:15:44 +0000 (07:15 +0000)]
am
0cbbfb2b: am
7640d989: CEC: Fix a regression bug
automerge:
5b972d5
* commit '
5b972d58cb9ccbbbc3302655f83b04ddd717c299':
CEC: Fix a regression bug
Jinsuk Kim [Thu, 29 Jan 2015 07:14:40 +0000 (07:14 +0000)]
am
5e34b6b9: am
43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
automerge:
c8ece53
* commit '
c8ece533b2c19001d9ada319c1cf480ba97377d8':
CEC: Let <Active Source> from the active source work
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:04:48 +0000 (05:04 +0000)]
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge:
d169839 automerge:
0a22d43
automerge:
7e553a0
* commit '
7e553a06a0506529563c6a0920e0de2a0d48cedc':
aggressively blacklist WifiConfiguration for the purpose of switching network
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
Svetoslav [Thu, 29 Jan 2015 02:54:21 +0000 (02:54 +0000)]
Merge "AccessibilityNodeInfo refresh returns a stale state."
Stuart Scott [Thu, 29 Jan 2015 02:13:35 +0000 (02:13 +0000)]
am
8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge:
f4e5236
automerge:
cf8ae79
* commit '
cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b':
Change getDeviceId to take phoneId.
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.
OSDN Git Service
