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

163172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jinsuk Kim
2ee0d6f44d 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
 2015-01-29 06:45:02 +00:00
Jinsuk Kim
7640d9895c 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
 2015-01-29 06:41:49 +00:00
Jinsuk Kim
43b2746bcd Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev 2015-01-29 06:40:47 +00:00
vandwalle
0a22d43c91 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
 2015-01-29 04:57:00 +00:00
vandwalle
d1698393e7 Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev 2015-01-29 04:50:44 +00:00
Jinsuk Kim
7cd4a589af CEC: Add CEC device upon receiving <Report Physical Address> 
Help devices be processed sooner when new device detection operation
takes longer than usual.

Bug: 19181472
Change-Id: I96c29081a9c7c9f73ebcd027ed9d18056dc89bf9
 2015-01-29 11:20:53 +09:00
Amit Mahajan
1e62748b94 Adding new API to ISms to check if default SMS SIM needs to be chosen by 
user.

Bug: 19112332
Change-Id: I7da30ebcebaf57f713acc6938626930dbc51d1f2
 2015-01-28 18:15:56 -08:00
Stuart Scott
8d702000a7 Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev 
automerge: f4e5236

* commit 'f4e52360613d20dc8176ce8a37cb05ad904fad0d':
  Change getDeviceId to take phoneId.
 2015-01-29 01:58:53 +00:00
Stuart Scott
f4e5236061 Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev 2015-01-29 01:55:47 +00:00
Lajos Molnar
4fb442617c ImageReader: add support for compatible flexYUV buffers 
Bug: 17906609
Change-Id: Ia21aff632b9a92f4e391b3917a7774af46fd81a0
 2015-01-28 17:34:23 -08:00
Dirk Dougherty
820d5c52b7 am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d 
automerge: e0b5a38

* commit 'e0b5a3812269228070dabb792bc501ae435338bb':
  Doc change: Update Ads terms language.
 2015-01-29 01:01:32 +00:00
Dirk Dougherty
e0b5a38122 am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. 
automerge: 3f9d57d

* commit '3f9d57dbe896d56e0eae381aa3e70ac93d755f24':
  Doc change: Update Ads terms language.
 2015-01-29 00:54:45 +00:00
Sailesh Nepal
11aeae5e46 Fix crash when making emergency calls 
When making an emergency call the fallback connection
manager would crash. The problem was that the connection
manager would get a setVideoProvider() call even though
it wasn't routing calls.

The root cause of this crash is b/19185063. As a short term
work around I'm adding a null check to avoid the crash.

BUG: 19020123
Change-Id: Ibe4a791882c9b5e21ae629a63f8d89cd3deba828
 2015-01-28 16:54:09 -08:00
Jae Seo
4b1e5814d1 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
 2015-01-29 00:33:29 +00:00
Dirk Dougherty
3f9d57dbe8 am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. 
* commit '8b1ad8e4d148b70e31d675515e8ad24ca3d12169':
  Doc change: Update Ads terms language.
 2015-01-29 00:30:37 +00:00
Dirk Dougherty
8b1ad8e4d1 am 49738792: Doc change: Update Ads terms language. 
* commit '497387928d53cca060c3f43b3a9f5c7834564333':
  Doc change: Update Ads terms language.
 2015-01-29 00:24:39 +00:00
Dirk Dougherty
497387928d Doc change: Update Ads terms language. 
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
 2015-01-29 00:16:25 +00:00
Jae Seo
7119144218 TIF: Do not call session callbacks when the session is already released 
Bug: 19146382
Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd
 2015-01-28 15:50:08 -08:00
Eino-Ville Talvala
06b1014cf2 Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev 
automerge: a17ab21

* commit 'a17ab21d4c81ecc80b00b14fe56ce721b4e757ae':
  Camera2 legacy: Do not advertise NV21 support.
 2015-01-28 23:22:56 +00:00
Eino-Ville Talvala
a17ab21d4c Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev 2015-01-28 23:20:01 +00:00
xinhe
93487e286e 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
 2015-01-28 21:45:25 +00:00