drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,143 Commits 1 Branch 0 Tags
Commit Graph

163143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Larimer
320f505ed5 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':
 2015-01-29 19:38:51 +00:00
Jon Larimer
64bdf77d95 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':
 2015-01-29 19:38:48 +00:00
Jon Larimer
52fba8d134 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':
 2015-01-29 19:30:57 +00:00
Jon Larimer
8bb65246f2 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':
 2015-01-29 19:29:31 +00:00
Sanket Padawe
14d21344d2 Suppress logging to avoid showing phone no. 
Bug: 19193581
Change-Id: I6ee17a2eab9d0ed84c931d6395a5aeb148177f95
 2015-01-29 11:21:34 -08:00
Scott Rowe
87a1bf0970 docs: b/19193358 Android TV overscan instructions: settings reversed in text 
Change-Id: I7c617ed67068927d27c5a2243a2dd07b04e668b5
 2015-01-29 11:05:13 -08:00
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

* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 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  -s ours

* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
  DO NOT MERGE Restore calling identity before checking permission
 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
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
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  -s ours

* commit 'f8571c8a170f0cb8341b3e2adda306bb709b824a':
 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  -s ours

* commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
  DO NOT MERGE Restore calling identity before checking permission
 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
Lajos Molnar
2a8dc00eed Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev 
automerge: 8514766

* commit '8514766a0a388c3598eaa64709edc634f8edccb1':
  ImageReader: add support for compatible flexYUV buffers
 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
a6a01787fb am 07600116: CEC: Ensure stable AVR connection 
* commit '07600116b59e2accd1e95b9029c2c9819cd76c5a':
  CEC: Ensure stable AVR connection
 2015-01-29 06:54:15 +00:00
Jinsuk Kim
f4e4eb5401 am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low 
* commit '2ee0d6f44d7274bb1846cc6ff7a60451539a2b51':
  CEC: Stop ARC if hotplug event is asserted low
 2015-01-29 06:54:11 +00:00
Jinsuk Kim
07600116b5 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
 2015-01-29 06:47:34 +00:00
Jinsuk Kim
0cbbfb2bea am 7640d989: CEC: Fix a regression bug 
* commit '7640d9895cf8fae7a99a7db5bba0079ba6022621':
  CEC: Fix a regression bug
 2015-01-29 06:46:43 +00:00
Jinsuk Kim
5e34b6b9af 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
 2015-01-29 06:46:39 +00:00