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

179012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
d41c4d8c73 Add overrides and switch to nullptr keyword for all files 
Adds remaining missing overrides and nullptr usages, missed due to
an extreme failure in tool usage.

Change-Id: I56abd72975a3999ad13330003c348db40f59aebf
 2015-01-05 16:49:13 -08:00
Tom Hudson
8dfaa49042 Make DisplayListRenderer inherit from Canvas, merge JNI 
Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.

Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.

bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
 2015-01-05 15:25:41 -08:00
Narayan Kamath
c82be5f27f am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release" 
automerge: b7974bd

* commit 'b7974bd31d06d439cb75f8a3a0ad032fa689c729':
  Race-condition in SoundPool during release
 2015-01-05 18:10:33 +00:00
Narayan Kamath
b7974bd31d am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release" 
* commit 'dd65a4f735a311fe60c065449e394974807ff297':
  Race-condition in SoundPool during release
 2015-01-05 18:08:06 +00:00
Narayan Kamath
dd65a4f735 am ea4cdd44: Merge "Race-condition in SoundPool during release" 
* commit 'ea4cdd44541d76adea9b0b185740796d6cf6ac64':
  Race-condition in SoundPool during release
 2015-01-05 18:02:32 +00:00
Narayan Kamath
ea4cdd4454 Merge "Race-condition in SoundPool during release" 2015-01-05 17:57:27 +00:00
Jason Monk
a199880a01 am cf28f9b8: am 4ae97d36: Post broadcasts to bg and cache bt state info 
automerge: 2858ca9

* commit '2858ca9e282b10afd67da73885e3a25e82e510a6':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:37:46 +00:00
Jason Monk
2858ca9e28 am cf28f9b8: am 4ae97d36: Post broadcasts to bg and cache bt state info 
* commit 'cf28f9b8830503605ff254a5ca8edd368e065a93':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:34:35 +00:00
Jason Monk
cf28f9b883 am 4ae97d36: Post broadcasts to bg and cache bt state info 
* commit '4ae97d3632edf4fd00fe23b9a2304e4e0f2348b7':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:29:20 +00:00
Jason Monk
4ae97d3632 Post broadcasts to bg and cache bt state info 
Add a background thread to post bt broadcasts to for processing.

Try to cache all bluetooth connection state info possible and pull
from broadcasts because requesting it too often may be locking up
devices.

Bug: 18771211
Change-Id: I2cf4852c935b2f471e735d953370e5d9e996c6f7
 2015-01-05 11:09:48 -05:00
Geoff Mendal
87439cb601 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:47:58 +00:00
Geoff Mendal
d9c51a77db Merge "Import translations. DO NOT MERGE" 2015-01-05 14:47:03 +00:00
Geoff Mendal
5e1370cd62 Import translations. DO NOT MERGE 
Change-Id: I92a69ec4b6384998d842369bda0531a8c5ce7825
Auto-generated-cl: translation import
 2015-01-05 06:44:53 -08:00
Geoff Mendal
269cbab0cd Import translations. DO NOT MERGE 
Change-Id: I71ee9b0879e33e6fe00883877ee712a93f451357
Auto-generated-cl: translation import
 2015-01-05 06:43:14 -08:00
Geoff Mendal
0b07a8756c Merge "Import translations. DO NOT MERGE" 2015-01-05 14:34:12 +00:00
Geoff Mendal
01d33e5cf2 Import translations. DO NOT MERGE 
Change-Id: I8aed2731e04350bbf8c50de7ebc81f9aaddf8fee
Auto-generated-cl: translation import
 2015-01-05 06:32:26 -08:00
Geoff Mendal
fef673eaa4 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:28:45 +00:00
Geoff Mendal
22cd10d671 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:25:58 +00:00
Geoff Mendal
743f1e2cc8 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:25:02 +00:00
Geoff Mendal
39d7a360cb Import translations. DO NOT MERGE 
Change-Id: I2d6f0dda941a9f61b21d14c8d9d67be5a58de9ce
Auto-generated-cl: translation import
 2015-01-05 06:22:04 -08:00
Geoff Mendal
e66e10b563 Import translations. DO NOT MERGE 
Change-Id: Ibe706a89d57655a9fb5890533887ca7a793190aa
Auto-generated-cl: translation import
 2015-01-05 06:19:02 -08:00
Geoff Mendal
ffeed7078c Import translations. DO NOT MERGE 
Change-Id: I16370c1730b23cbcae593add08cee035c31469b4
Auto-generated-cl: translation import
 2015-01-05 06:17:21 -08:00
Geoff Mendal
4a682c1b44 Import translations. DO NOT MERGE 
Change-Id: I9c93551bd46a5ef15b327a8f7ae332e69578ad90
Auto-generated-cl: translation import
 2015-01-05 06:11:03 -08:00
Jaewan Kim
64616f2fc7 Merge "Support quatation mark for text command" 2015-01-05 08:32:01 +00:00
Jinsuk Kim
a8f6c40f8a am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev 
automerge: fe3cdf0

* commit 'fe3cdf015e42168954f20125e7c9f4495f9d4647':
  CEC: Let MHL device be of type 'source'
 2015-01-05 07:25:06 +00:00
Jinsuk Kim
fe3cdf015e am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev 
* commit '877919bb182dbd8c87901cb94f318cf5d5408bc8':
  CEC: Let MHL device be of type 'source'
 2015-01-05 07:23:05 +00:00
Jinsuk Kim
877919bb18 am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev 
* commit '6cfb44952a76303fe1c7cc75b545cb8aad72eecf':
  CEC: Let MHL device be of type 'source'
 2015-01-05 07:16:24 +00:00
Jinsuk Kim
6cfb44952a Merge "CEC: Let MHL device be of type 'source'" into lmp-mr1-dev 2015-01-05 07:10:08 +00:00
Jinsuk Kim
e416d0f67b CEC: Let MHL device be of type 'source' 
MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().

Bug: 18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
 2015-01-05 16:07:28 +09:00
Sungsoo Lim
1f5fa2f198 am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
automerge: 64a5234  -s ours

* commit '64a5234a3a04108e259730cbdbbb03fd70ff24ed':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:39:27 +00:00
Sungsoo Lim
64a5234a3a am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
* commit '269aad530493ccdd7ec78c1704eebd4476348b5d':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:36:57 +00:00
Sungsoo Lim
269aad5304 am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
* commit 'b65ad80de116f42fb3f2821363d52ce71e553517':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:29:23 +00:00
Sungsoo Lim
b65ad80de1 Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 2015-01-05 04:25:12 +00:00
Sungsoo Lim
48248c80e5 DO NOT MERGE Make mute/unmute work 
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
(cherry picked from commit d1851e6e4e49b6a45d9e013de2e1384711975328)
 2015-01-05 11:50:49 +09:00
Dongwon Kang
2806cb5157 am e9a205ce: am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
automerge: 871a962  -s ours

* commit '871a962b7961a3d5ac7f0a9c7d55f25dbcb4ab2c':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:44:32 +00:00
Dongwon Kang
871a962b79 am e9a205ce: am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
* commit 'e9a205cec4001faab38a1fdba88b29125bfe37d1':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:42:06 +00:00
Dongwon Kang
e9a205cec4 am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
* commit '017bb8523dd7c3dbfd00c055fde241de4dca9da2':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:26:15 +00:00
Dongwon Kang
017bb8523d DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit b61077357eb6d8b95b303ef107b15db243a9621b)
 2015-01-05 02:12:44 +00:00
Dongwon Kang
766dc9e6ab Merge "TIF: Add a null checking in TvInputHardwareManager." 2015-01-05 01:20:43 +00:00
Sungsoo Lim
9dcba434e2 Fix typo 
Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84
 2015-01-05 09:13:20 +09:00
Jinsuk Kim
65e644b449 am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
automerge: e82e47e

* commit 'e82e47e9cb01a19e88a89f8a43a7a15540b96869':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:27:36 +00:00
Jinsuk Kim
e82e47e9cb am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
* commit '270686b681e74622a09bb3081b1e03c55f692c3f':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:25:40 +00:00
Jinsuk Kim
270686b681 am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
* commit 'ad1e3d7df42376cd2a257b6c3b2fed540658a6e3':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:20:30 +00:00
Narayan Kamath
fc7bfe6973 am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774" 
automerge: 0699722

* commit '0699722a13c0a8cee6477dc88c843353f201d742':
  fix issuse 65774
 2015-01-02 10:36:08 +00:00
Narayan Kamath
0699722a13 am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774" 
* commit '3d6cfe0eb1c9fcfabaf7b02548dd6d5cc16203d6':
  fix issuse 65774
 2015-01-02 10:34:03 +00:00
Narayan Kamath
3d6cfe0eb1 am 873b291b: Merge "fix issuse 65774" 
* commit '873b291b15c35ae1ec7ea29de4c012275e13e761':
  fix issuse 65774
 2015-01-02 10:28:22 +00:00
Narayan Kamath
873b291b15 Merge "fix issuse 65774" 2015-01-02 10:22:21 +00:00
Paul Quei
65e37ee936 fix issuse 65774 
"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."

Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>
 2015-01-02 10:21:55 +00:00
Jinsuk Kim
ad1e3d7df4 CEC: Buffer <Set System Audio Mode> 
<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.

Bug: 18809965

Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c
 2015-01-02 16:08:56 +09:00
Baligh Uddin
9939422efa Import translations. DO NOT MERGE 
Change-Id: I941e39b33f0dd49c4e0385d22787823acef5d93a
Auto-generated-cl: translation import
 2014-12-31 11:16:03 -08:00