Jesse Hall
cd9fd427ac
am b8080d9a
: am 2a36497e
: Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
...
* commit 'b8080d9a3b760617c5dde7b1d2d63aa2bcecf3a7':
Stop using default value for Surface producerControlledByApp parameter
2013-09-16 20:32:34 -07:00
Jesse Hall
b8080d9a3b
am 2a36497e
: Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
...
* commit '2a36497e45d4d96e35fed89cfdcb09b71459ac3c':
Stop using default value for Surface producerControlledByApp parameter
2013-09-16 20:30:11 -07:00
Jesse Hall
2a36497e45
Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
2013-09-17 03:27:15 +00:00
Jesse Hall
83cafffeac
Stop using default value for Surface producerControlledByApp parameter
...
Bug: 10785749
Change-Id: Ifbf9340e5eabe621a69e990ec3e05ac51f8db66a
2013-09-16 15:39:55 -07:00
Jesse Hall
41058088cf
am fccb7ac5
: am a2ba428a
: Disable the egl_khr_gl_colorspace extension
...
* commit 'fccb7ac5968ee4cb852035b8ed93f8a21b6e7075':
Disable the egl_khr_gl_colorspace extension
2013-09-16 12:48:38 -07:00
Jesse Hall
fccb7ac596
am a2ba428a
: Disable the egl_khr_gl_colorspace extension
...
* commit 'a2ba428a22125558a129c6ba4001dfc2169de2fe':
Disable the egl_khr_gl_colorspace extension
2013-09-16 12:44:40 -07:00
Alan Viverette
ff735dd2b8
Merge "Add API for pushing color transforms to SurfaceFlinger"
2013-09-16 19:27:22 +00:00
Jesse Hall
a2ba428a22
Disable the egl_khr_gl_colorspace extension
...
Bug: 10777398
Change-Id: Ib50ea8b9d5d960537701b85929d6312304993a0f
2013-09-16 11:21:48 -07:00
Alan Viverette
9c5a333511
Add API for pushing color transforms to SurfaceFlinger
...
BUG: 9057596
Change-Id: Iea0953366eac875b7968897a75472c25a137edb5
2013-09-12 20:04:35 -07:00
Mike Lockwood
99c2766177
Merge "servicemanager: Add support for "audio" service running as AID_AUDIO user"
2013-09-13 00:19:44 +00:00
Kenny Root
0375f93e18
resolved conflicts for merge of 06ef81bd
to master
...
Change-Id: Iecb252b38c98d6abe83f25927557b256183c2a01
2013-09-12 11:56:46 -07:00
Kenny Root
06ef81bd70
resolved conflicts for merge of 1852eb4f
to klp-dev-plus-aosp
...
Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
2013-09-12 11:51:34 -07:00
Kenny Root
1852eb4feb
Merge "Remove copy of UniquePtr.h"
2013-09-12 18:41:19 +00:00
Kenny Root
c668871ac3
Use canonical UniquePtr.h file
...
Change-Id: Icc75bca078ffaf0c09b88ce5e897d666d1054063
2013-09-11 23:25:08 -07:00
Mathias Agopian
24695a1cff
am 7c4f2365
: am 90ed3e8d
: fix a few problems with BitTube
...
* commit '7c4f236532692b847b9b103df6490549656ae993':
fix a few problems with BitTube
2013-09-11 17:24:11 -07:00
Mathias Agopian
7c4f236532
am 90ed3e8d
: fix a few problems with BitTube
...
* commit '90ed3e8d7883d9c80fb8bf11b1c593bd8b2b39d0':
fix a few problems with BitTube
2013-09-11 15:06:10 -07:00
Kenny Root
0ae966033d
Remove copy of UniquePtr.h
...
The UniquePtr.h file is no longer in libcore/... so there is no need to
have this extra copy of it anymore.
Change-Id: I4ec4f86d2844e524b50441c3a9100a50a6a45b1a
2013-09-11 14:29:20 -07:00
Mike Lockwood
2a5fd8b064
servicemanager: Add support for "audio" service running as AID_AUDIO user
...
Change-Id: Ia41f1edd05f233ac5ce43c34eb8ab3ab76ffa194
2013-09-11 08:10:11 -07:00
Mathias Agopian
90ed3e8d78
fix a few problems with BitTube
...
BitTube used to send objects one at a time and didn't
handle errors properly.
We now send all the objects in one call, which means they
have to be read as a single batch as well. This changes the
BitTube API.
Update SensorService to the new API.
Also added an API to set the size of the send buffer.
Bug: 10641596
Change-Id: I77c70d35e351fdba0416fae4b7ca3b1d56272251
2013-09-10 21:10:53 -07:00
Chong Zhang
cf1eb71a8d
Merge "HDCP: add getCaps to query HDCP module capabilities"
2013-09-10 16:50:10 +00:00
Chong Zhang
b344adf089
HDCP: add getCaps to query HDCP module capabilities
...
This is used now to query whether HDCP module supports encryption
from a native buffer output from the encoder.
Bug: 10609422
Change-Id: Ib7fa14e7f4de1da90b46eaa174a7a05ec9dacbdc
2013-09-07 23:33:50 -07:00
Mathias Agopian
68fc607e3d
am 455ab58c
: am 63108c34
: fix a possible null dereference when eglMakeCurrent() fails
...
* commit '455ab58c09bb6ba76b264523c3cd28a1a68fb5fc':
fix a possible null dereference when eglMakeCurrent() fails
2013-09-06 15:09:34 -07:00
Mathias Agopian
455ab58c09
am 63108c34
: fix a possible null dereference when eglMakeCurrent() fails
...
* commit '63108c34ec181e923b68ee840bb7960f205466a7':
fix a possible null dereference when eglMakeCurrent() fails
2013-09-06 15:06:41 -07:00
Mathias Agopian
63108c34ec
fix a possible null dereference when eglMakeCurrent() fails
...
Bug: 10648797
Change-Id: Iee0be47f2646feb25de4ea199bbb9b707452916e
2013-09-06 13:36:49 -07:00
Mathias Agopian
8e84e29486
am 7390e049
: am 77414216
: Merge "color blindness enhancement" into klp-dev
...
* commit '7390e04932dc1b588967d9951eeaf0d00e8a5a83':
color blindness enhancement
2013-09-06 09:52:08 -07:00
Mathias Agopian
7390e04932
am 77414216
: Merge "color blindness enhancement" into klp-dev
...
* commit '77414216cde4d131eb09454d81dab30e408e4e7a':
color blindness enhancement
2013-09-05 19:13:13 -07:00
Mathias Agopian
77414216cd
Merge "color blindness enhancement" into klp-dev
2013-09-06 02:09:43 +00:00
Mike Lockwood
cbe36fe1ec
Add support for sending and receiving ParcelFileDescriptors from native Binder code
...
Change-Id: I7f308e28ebac0755628e19c9b4d0d7399341b435
2013-09-05 08:43:22 -07:00
Mathias Agopian
ff2ed70fa3
color blindness enhancement
...
This is an attempt at improving the experience of
users with color vision impairement.
At this time this feature can only be enabled for
debugging:
adb shell service call SurfaceFlinger 1014 i32 PARAM
with PARAM:
0 : disabled
1 : protanomaly/protanopia simulation
2 : deuteranomaly/deuteranopia simulation
3 : tritanopia/tritanomaly simulation
11, 12, 13: same as above w/ attempted correction/enhancement
The enhancement algorithm tries to spread the "error"
such that tones that would otherwise appear similar can be
distinguished.
Bug: 9465644
Change-Id: I860f7eed0cb81f54ef9cf24ad78155b6395ade48
2013-09-04 22:11:15 -07:00
Marco Nelissen
31344a6d4d
Merge "Remove obsolete comment"
2013-09-05 03:48:25 +00:00
Todd Poynor
df12472067
Merge "libbatteryservice: Add average current property"
2013-09-05 01:37:56 +00:00
Dianne Hackborn
3b010de1c1
am ecc05fb5
: am 59b1516f
: Fix issue #10422349 : Limit/change the battery history data in batterystats
...
* commit 'ecc05fb5430ebb57710850f22d2a370c2af86e9d':
Fix issue #10422349 : Limit/change the battery history data in batterystats
2013-09-04 18:32:12 -07:00
Dianne Hackborn
ecc05fb543
am 59b1516f
: Fix issue #10422349 : Limit/change the battery history data in batterystats
...
* commit '59b1516f4cefcfd599f4e5e9c4a227a48d1ace65':
Fix issue #10422349 : Limit/change the battery history data in batterystats
2013-09-04 18:24:33 -07:00
Dianne Hackborn
59b1516f4c
Fix issue #10422349 : Limit/change the battery history data in batterystats
...
Use new compact option to include history when dumping battery stats.
Change-Id: I3833a88db76d8791bd5c2e8f6ff414af65472a42
2013-09-04 18:04:14 -07:00
Todd Poynor
c150900793
libbatteryservice: Add average current property
...
Change-Id: I519c2fb9f7cec21d9f87e73fa96b2f58a7ab27a5
2013-09-04 17:41:56 -07:00
Chong Zhang
edfc478196
am 9f74ea29
: am e6772914
: Merge "HDCP: add enums for HDCP module capabilities" into klp-dev
...
* commit '9f74ea29b8c4fa9635548b99d0a1e0d0c6c00bea':
HDCP: add enums for HDCP module capabilities
2013-09-04 15:14:26 -07:00
Chong Zhang
9f74ea29b8
am e6772914
: Merge "HDCP: add enums for HDCP module capabilities" into klp-dev
...
* commit 'e67729144a56966dd39e1bcda5efa51852e16d74':
HDCP: add enums for HDCP module capabilities
2013-09-04 15:11:28 -07:00
Chong Zhang
e67729144a
Merge "HDCP: add enums for HDCP module capabilities" into klp-dev
2013-09-04 22:07:46 +00:00
Marco Nelissen
56e01384c7
Remove obsolete comment
...
Change-Id: I8b040e4b2e968fd0754e15dcf9f899fbfe210b6e
2013-09-04 19:51:16 +00:00
Chong Zhang
a3a918557d
HDCP: add enums for HDCP module capabilities
...
This change adds the enums for HDCP caps. An interface getCaps()
will be added later for querying whether HDCP module supports
encryption from a native buffer output from the encoder.
Bug: 10609422
Change-Id: Ib7fa14e7f4de1da90b46eaa174a7a05ec9dacbdc
2013-09-04 11:38:43 -07:00
Aravind Akella
91e0ff5739
am e29df8b9
: am a5552de9
: Merge "Sensor batching. Changes to the native code." into klp-dev
...
* commit 'e29df8b929128621c8ef90091696d414eb235276':
Sensor batching. Changes to the native code.
2013-09-03 17:45:18 -07:00
Aravind Akella
e29df8b929
am a5552de9
: Merge "Sensor batching. Changes to the native code." into klp-dev
...
* commit 'a5552de96f0cff9fb1947d8d21556bfeccf9cd03':
Sensor batching. Changes to the native code.
2013-09-03 17:43:44 -07:00
Aravind Akella
a5552de96f
Merge "Sensor batching. Changes to the native code." into klp-dev
2013-09-04 00:41:41 +00:00
Aravind Akella
724d91d778
Sensor batching. Changes to the native code.
...
Bug: 10109508
Change-Id: I7333f3aac76125a8226a4c99c901fb904588df04
2013-09-03 17:04:36 -07:00
Mathias Agopian
68ca2640a7
am 4de85b49
: am 1d4d8f94
: improve mat44 implementation
...
* commit '4de85b49b3c1ae6c27351a0e6fd8d6490fe4f0cc':
improve mat44 implementation
2013-09-03 16:53:47 -07:00
Mathias Agopian
4de85b49b3
am 1d4d8f94
: improve mat44 implementation
...
* commit '1d4d8f94e2989b7c8667602304df9059d2701653':
improve mat44 implementation
2013-09-03 16:49:34 -07:00
Mathias Agopian
1d4d8f94e2
improve mat44 implementation
...
this will make it easier to create matrices of different sizes
Change-Id: I2c1771ba0823c42d737762e2dfc2cd47eb302767
2013-09-03 16:38:49 -07:00
Mathias Agopian
9b7176b428
am d213910a
: am 9b5534b0
: Merge changes I8283a989,I64add89a into klp-dev
...
* commit 'd213910ab0acc956ee66bd3a0079a6393e7c695c':
switch to use mat4
vector and matrix classes for graphics use
2013-08-30 18:33:08 -07:00
Mathias Agopian
d213910ab0
am 9b5534b0
: Merge changes I8283a989,I64add89a into klp-dev
...
* commit '9b5534b0e5e1510f56e6a2c58ad0816167603ebd':
switch to use mat4
vector and matrix classes for graphics use
2013-08-30 18:31:38 -07:00
Mathias Agopian
9b5534b0e5
Merge changes I8283a989,I64add89a into klp-dev
...
* changes:
switch to use mat4
vector and matrix classes for graphics use
2013-08-31 01:30:10 +00:00