Christopher Ferris
6de9653ac8
Merge "Remove unnecessary include."
2013-09-19 23:16:10 +00:00
Christopher Ferris
d142f4b787
Remove unnecessary include.
...
All these files are including utils/CallStack.h, but none of the code
uses any CallStack objects.
Change-Id: I38c3a346a3bd0ddbff368d0f7f8b3f3d78fc0432
2013-09-19 15:45:03 -07:00
Mike Lockwood
1b92226d3f
Merge "Add support for "input" service running as user AID_INPUT"
2013-09-19 00:06:53 +00:00
Mathias Agopian
0f0e845113
am a7e1660b
: am c1c05de4
: fix camera API 2.0 orientation
...
* commit 'a7e1660b257326f99261e7c9b2d58c9d2e68d0b0':
fix camera API 2.0 orientation
2013-09-18 15:36:00 -07:00
Mathias Agopian
a7e1660b25
am c1c05de4
: fix camera API 2.0 orientation
...
* commit 'c1c05de415854eb7a13a16b7e22a22de8515123a':
fix camera API 2.0 orientation
2013-09-18 15:33:38 -07:00
Mike Lockwood
30a7d5a5a9
Add support for "input" service running as user AID_INPUT
...
Change-Id: I8b6700c25ea2264fb3e1c16e18df281eb67b931f
2013-09-18 14:44:30 -07:00
Mathias Agopian
c1c05de415
fix camera API 2.0 orientation
...
we add a flag to ANativeWindow::setBufferTransform that means
"apply the inverse rotation of the display this buffer is displayed
onto to".
Bug: 10804238
Change-Id: Id2447676271950463e8dbcef1b95935c5c3f32b2
2013-09-17 23:45:22 -07:00
Mathias Agopian
2285c008fa
am e803e609
: am 799f5126
: Fix build (tests)
...
* commit 'e803e6095e007563df939326fdd3ca5109619a42':
Fix build (tests)
2013-09-17 16:01:38 -07:00
Mathias Agopian
e803e6095e
am 799f5126
: Fix build (tests)
...
* commit '799f51268006f319f6ae538dca670bfc7f522688':
Fix build (tests)
2013-09-17 15:58:55 -07:00
Mathias Agopian
799f512680
Fix build (tests)
...
Change-Id: I5b233ef448e5e7eec3818c6586dfea138b28f7b6
2013-09-17 15:55:18 -07:00
Mathias Agopian
7229e98229
am 3f342c11
: am 02b62df7
: Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
...
* commit '3f342c113360eacc1e9c1ff481cb03f700a50117':
Make sure do disconnect from a BQ when its client dies.
2013-09-17 14:35:29 -07:00
Mathias Agopian
3f342c1133
am 02b62df7
: Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
...
* commit '02b62df7119b27c89d91d96938d8f4f5232b296b':
Make sure do disconnect from a BQ when its client dies.
2013-09-17 14:33:09 -07:00
Mathias Agopian
02b62df711
Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
2013-09-17 21:31:14 +00:00
Aravind Akella
f0d2b05ac7
am 30480ac9
: am fca43392
: Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
...
* commit '30480ac9f9cb102095e6bfec2226b48e5d1f4060':
Fix for AOSP fusion sensors not handling multiple clients correctly.
2013-09-17 11:26:15 -07:00
Aravind Akella
30480ac9f9
am fca43392
: Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
...
* commit 'fca43392b755b34c83c3abbfea216bafa9cd8171':
Fix for AOSP fusion sensors not handling multiple clients correctly.
2013-09-17 11:22:59 -07:00
Aravind Akella
fca43392b7
Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
2013-09-17 18:17:50 +00:00
Aravind Akella
bb7f65829e
am 47e300c4
: am f0c72846
: Merge "Sensor Batching Bug fixes." into klp-dev
...
* commit '47e300c4b44762bcf3de2332eff1b0b00a8123e8':
Sensor Batching Bug fixes.
2013-09-17 10:53:50 -07:00
Aravind Akella
47e300c4b4
am f0c72846
: Merge "Sensor Batching Bug fixes." into klp-dev
...
* commit 'f0c728465a87435e6a8a66991451cf6fe72acc24':
Sensor Batching Bug fixes.
2013-09-17 10:51:53 -07:00
Aravind Akella
f0c728465a
Merge "Sensor Batching Bug fixes." into klp-dev
2013-09-17 17:49:27 +00:00
Amith Yamasani
367a2979c9
am 3e08bb76
: am fc7083a8
: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
...
* commit '3e08bb7668c7d57925e393f5d27db59c10ba07eb':
Enable FEATURE_DEVICE_ADMIN for handheld devices
2013-09-17 09:02:04 -07:00
Amith Yamasani
3e08bb7668
am fc7083a8
: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
...
* commit 'fc7083a828b6db00698c1418e5f370b31625213c':
Enable FEATURE_DEVICE_ADMIN for handheld devices
2013-09-17 08:58:55 -07:00
Amith Yamasani
fc7083a828
Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
2013-09-17 15:56:24 +00:00
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
Mathias Agopian
365857df8b
Make sure do disconnect from a BQ when its client dies.
...
Bug: 5679534
Change-Id: If447e8673df83fe0b1d6210641e0a48522501a53
2013-09-16 16:15:21 -07:00
Aravind Akella
bf72deea2f
Fix for AOSP fusion sensors not handling multiple clients correctly.
...
Bug: 10786801
Change-Id: I7b938bc583a303a30237c3d93b5accbf64cc90b5
2013-09-16 15:49:49 -07: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
Aravind Akella
4c8b951f8d
Sensor Batching Bug fixes.
...
i) SensorService dropping events. Increase SOCKET_BUFFER_SIZE in BitTube ctor.
ii) Call flush before every activate.
iii) Emulate flush for older devices. Add a trivial flush complete event when flush is called.
Bug: 10641596
Change-Id: I30d0f3948e830457143f16e157b6ad81908687ce
2013-09-16 14:43:02 -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
Amith Yamasani
7562c0e28f
Enable FEATURE_DEVICE_ADMIN for handheld devices
...
Bug: 9520957
Change-Id: I9c09dc726509db9e6d9ba4700255c74528b9f9fa
2013-09-16 10:48:35 -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