OSDN Git Service
Mike Lockwood [Thu, 3 Oct 2013 17:29:39 +0000 (10:29 -0700)]
Move libandroidfw from frameworks/base
Change-Id: I8228c9a796e68e920c6a7dfc154c4b70ba66b082
Jamie Gennis [Wed, 2 Oct 2013 18:19:52 +0000 (11:19 -0700)]
am
6be1d210: am
f0cf5f10: BufferQueue: fix a test crash
* commit '
6be1d210eef392f5745d58a0033572b1af4b2f2a':
BufferQueue: fix a test crash
Jamie Gennis [Wed, 2 Oct 2013 18:16:59 +0000 (11:16 -0700)]
am
f0cf5f10: BufferQueue: fix a test crash
* commit '
f0cf5f103cf9c54d59de4ed6f1d8ddd2302dec1b':
BufferQueue: fix a test crash
Jamie Gennis [Thu, 26 Sep 2013 00:21:56 +0000 (17:21 -0700)]
BufferQueue: fix a test crash
Bug:
10935880
Change-Id: If76e9fb055103bad0db7e6c16487532671573149
Jamie Gennis [Wed, 2 Oct 2013 17:44:44 +0000 (10:44 -0700)]
am
886b1521: am
a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
* commit '
886b152111cc13dcfe1b47724f5e496f12ccc420':
GLConsumer: start using EGL_ANDROID_image_crop
Dave Burke [Wed, 2 Oct 2013 17:44:44 +0000 (10:44 -0700)]
am
9b4b1180: am
06993503: Merge "only clear FB when asked for the opaque layer" into klp-dev
* commit '
9b4b1180941f4d2ef9d3e7bd26bc1855ff9fb141':
only clear FB when asked for the opaque layer
Jamie Gennis [Wed, 2 Oct 2013 17:41:58 +0000 (10:41 -0700)]
am
a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
* commit '
a9c47f327373cbe48e187442c7f9554d24a75c08':
GLConsumer: start using EGL_ANDROID_image_crop
Dave Burke [Wed, 2 Oct 2013 17:41:57 +0000 (10:41 -0700)]
am
06993503: Merge "only clear FB when asked for the opaque layer" into klp-dev
* commit '
0699350336cccc244bb6c52a0d910f9599253812':
only clear FB when asked for the opaque layer
Jamie Gennis [Wed, 2 Oct 2013 17:36:48 +0000 (17:36 +0000)]
Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
Dave Burke [Wed, 2 Oct 2013 17:36:40 +0000 (17:36 +0000)]
Merge "only clear FB when asked for the opaque layer" into klp-dev
Jamie Gennis [Tue, 24 Sep 2013 00:22:10 +0000 (17:22 -0700)]
GLConsumer: start using EGL_ANDROID_image_crop
This change makes GLConsumer use the EGL_ANDROID_image_crop extension when
available on a device. The crop rectangle is passed to the EGL driver when
creating EGLImages, allowing the crop to be performed by the driver rather than
using the texture transform matrix.
Bug:
10897141
Change-Id: I63e9a5d5c85067376abc420e3639154468346311
Jesse Hall [Wed, 2 Oct 2013 16:57:03 +0000 (09:57 -0700)]
am
f3fa0712: am
93573e91: Merge "Treat composition frames with no layers as using GLES composition" into klp-dev
* commit '
f3fa0712282e760c316f44cba05f884f9399b98f':
Treat composition frames with no layers as using GLES composition
Jesse Hall [Wed, 2 Oct 2013 16:57:02 +0000 (09:57 -0700)]
am
72d270c5: am
b716e570: Set the outbuf acquire fence after we actually have it.
* commit '
72d270c5f0918d1dc7a6a1774b80469c9f28b7ea':
Set the outbuf acquire fence after we actually have it.
Jesse Hall [Wed, 2 Oct 2013 16:37:50 +0000 (09:37 -0700)]
am
93573e91: Merge "Treat composition frames with no layers as using GLES composition" into klp-dev
* commit '
93573e91c22ba8329222c69cd7f099f5703fb444':
Treat composition frames with no layers as using GLES composition
Jesse Hall [Wed, 2 Oct 2013 16:37:49 +0000 (09:37 -0700)]
am
b716e570: Set the outbuf acquire fence after we actually have it.
* commit '
b716e57048e945d5bceda33c2434c65d06464dba':
Set the outbuf acquire fence after we actually have it.
Jesse Hall [Wed, 2 Oct 2013 14:54:03 +0000 (14:54 +0000)]
Merge "Treat composition frames with no layers as using GLES composition" into klp-dev
Jesse Hall [Wed, 2 Oct 2013 03:58:49 +0000 (20:58 -0700)]
am
92d7c3ee: am
b65f32eb: Fix two EGLConfig selection bugs
* commit '
92d7c3ee03109cf2d465a103b828b7d7d3ee9848':
Fix two EGLConfig selection bugs
Jesse Hall [Wed, 2 Oct 2013 00:25:20 +0000 (17:25 -0700)]
Set the outbuf acquire fence after we actually have it.
In GLES-only mode, we don't have the outbuf acquire fence until after
GLES composition is done for the frame. We were setting the fence in
HWC's state immediately after dequeueing the buffer from the consumer,
before GLES had started. This fence got passed through HWC and on to
the consumer, so the consumer was reading the buffer before GLES was
done writing to it.
Now we update HWC's state just before set(), when we know we have the
right fence.
Bug:
11000763
Change-Id: Iea9db4c69634c352dc2d600f0bdb6bef2a432636
Mathias Agopian [Tue, 1 Oct 2013 22:36:52 +0000 (15:36 -0700)]
only clear FB when asked for the opaque layer
a layer need to be considered NOT opaque if it has a
plane-alpha.
Bug:
10846930
Change-Id: Ibd8981b63ede4560c7096bacc4cff46a7eb2a8bb
Jesse Hall [Tue, 1 Oct 2013 04:38:40 +0000 (21:38 -0700)]
am
b65f32eb: Fix two EGLConfig selection bugs
* commit '
b65f32ebe2c86869b07ac1c986660dfb2187b7d3':
Fix two EGLConfig selection bugs
Jesse Hall [Mon, 30 Sep 2013 23:49:30 +0000 (16:49 -0700)]
Treat composition frames with no layers as using GLES composition
When there are no window layers for a display, SurfaceFlinger clears
the undefined region using GLES. Some of the places that check for
GLES composition weren't considering this special case, in particular:
- We were skipping the eglSwapBuffers() on these frames.
- We were putting VirtualDisplaySurface in HWC-only composition mode.
This change centralizes the logic for this special case.
Bug:
10957068
Change-Id: I2deaf2ed101e8ea76708862a6bb67751b6078794
Todd Poynor [Mon, 30 Sep 2013 22:37:30 +0000 (15:37 -0700)]
batteryservice: Add BatteryExtraProperties
Change-Id: I050a4da14dd723a1d563b25a9e997db769fece3e
Jesse Hall [Sat, 28 Sep 2013 05:10:47 +0000 (22:10 -0700)]
Fix two EGLConfig selection bugs
This fixes two bugs introduced by
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d
(a) There is no invalid EGLConfig value, in particular zero is valid.
Checking return values of eglGetConfigs and eglChooseConfig is the
only way to determine success.
(b) The "simple" EGLConfig query used as the emulator fallback should
not include EGL_RECORDABLE; the emulator doesn't have it.
Bug:
10935622
Change-Id: Ib798a24e7cf06a679811c46eaa45d39174a715ec
Elliott Hughes [Fri, 27 Sep 2013 22:40:49 +0000 (15:40 -0700)]
am
b7f3742f: am
d9be16f9: Merge "Fix OpenGL stub exception handling."
* commit '
b7f3742feb0f419f9e2d7d43c6ba9dc64bb5d95c':
Fix OpenGL stub exception handling.
Elliott Hughes [Fri, 27 Sep 2013 22:38:04 +0000 (15:38 -0700)]
am
d9be16f9: Merge "Fix OpenGL stub exception handling."
* commit '
d9be16f920f7c2581fda3ca495c1e6fc88857a6c':
Fix OpenGL stub exception handling.
Elliott Hughes [Fri, 27 Sep 2013 22:31:18 +0000 (22:31 +0000)]
Merge "Fix OpenGL stub exception handling."
Mathias Agopian [Thu, 26 Sep 2013 19:47:35 +0000 (12:47 -0700)]
am
338acd68: am
86206b41: Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
* commit '
338acd6869532f2684cbd1e4f273eaffc6d4ef6d':
fix initialization of framebuffer target crop rect on hwc 1.3
Mathias Agopian [Thu, 26 Sep 2013 19:47:35 +0000 (12:47 -0700)]
am
0ff4b283: am
6da15f46: fix crashers with wifi/virtual displays
* commit '
0ff4b28396d77a0ed2f191836895a891108a8b5b':
fix crashers with wifi/virtual displays
Mathias Agopian [Thu, 26 Sep 2013 19:44:27 +0000 (12:44 -0700)]
am
86206b41: Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
* commit '
86206b41b2ff000e086301c6bafb8da577e563b2':
fix initialization of framebuffer target crop rect on hwc 1.3
Mathias Agopian [Thu, 26 Sep 2013 19:44:27 +0000 (12:44 -0700)]
am
6da15f46: fix crashers with wifi/virtual displays
* commit '
6da15f46f5f8b38e31384d641f8d3db2c3c6ea30':
fix crashers with wifi/virtual displays
Mathias Agopian [Thu, 26 Sep 2013 19:41:22 +0000 (19:41 +0000)]
Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
Mathias Agopian [Thu, 26 Sep 2013 03:44:34 +0000 (20:44 -0700)]
fix initialization of framebuffer target crop rect on hwc 1.3
Bug:
10936771
Change-Id: If283e5e231ca34b93e0b1784bb4e8e4c7bfd75de
Mathias Agopian [Thu, 26 Sep 2013 03:40:07 +0000 (20:40 -0700)]
fix crashers with wifi/virtual displays
Bug:
10647742
Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d
Mike Lockwood [Wed, 25 Sep 2013 16:28:41 +0000 (09:28 -0700)]
Cleanup Binder interface between sensorservice and BatteryStats
Change-Id: Ia507160a2534059afe93849c8efc8407a046b50e
Elliott Hughes [Wed, 25 Sep 2013 00:18:05 +0000 (17:18 -0700)]
Fix OpenGL stub exception handling.
Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2bdc22c5fe75f5e41ffb9dd9259ae92cf8a12917
Nick Kralevich [Fri, 20 Sep 2013 19:53:20 +0000 (12:53 -0700)]
am
e4e91c4e: resolved conflicts for merge of
e678897f to klp-dev-plus-aosp
* commit '
e4e91c4ead821afb5aced2e33ee39d8878eb4d1e':
Proper security labeling of multi-user data directories.
Nick Kralevich [Fri, 20 Sep 2013 19:45:20 +0000 (12:45 -0700)]
resolved conflicts for merge of
e678897f to klp-dev-plus-aosp
Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70
Nick Kralevich [Fri, 20 Sep 2013 19:35:36 +0000 (19:35 +0000)]
Merge "Proper security labeling of multi-user data directories."
Mathias Agopian [Fri, 20 Sep 2013 18:20:44 +0000 (11:20 -0700)]
am
754bad45: am
d555684c: reinstate black-screenshot debugging code
* commit '
754bad4534e9a2de8b4e3ecbe097993c71246f91':
reinstate black-screenshot debugging code
Mathias Agopian [Fri, 20 Sep 2013 18:19:58 +0000 (11:19 -0700)]
am
f589dd29: am
e2a3e872: Merge "Fix GLES context version selection" into klp-dev
* commit '
f589dd2915587994d3dd36eff2191962fe0b71c0':
Fix GLES context version selection
Eino-Ville Talvala [Fri, 20 Sep 2013 18:19:41 +0000 (11:19 -0700)]
am
1160e89d: am
d171da97: GLConsumer: Add query for current frame number.
* commit '
1160e89d31810f2ba66f8ab502281579115b39b0':
GLConsumer: Add query for current frame number.
Mathias Agopian [Fri, 20 Sep 2013 00:13:52 +0000 (17:13 -0700)]
am
d555684c: reinstate black-screenshot debugging code
* commit '
d555684cb36dfb959694db76962e570184f98838':
reinstate black-screenshot debugging code
Mathias Agopian [Fri, 20 Sep 2013 00:08:37 +0000 (17:08 -0700)]
reinstate black-screenshot debugging code
turned off by default.
Bug:
10809349
Change-Id: I3e6b8c7860e6b0e122b8f07de4020967cd1f005c
Christopher Ferris [Thu, 19 Sep 2013 23:16:10 +0000 (23:16 +0000)]
Merge "Remove unnecessary include."
Christopher Ferris [Thu, 19 Sep 2013 22:32:56 +0000 (15:32 -0700)]
Remove unnecessary include.
All these files are including utils/CallStack.h, but none of the code
uses any CallStack objects.
Change-Id: I38c3a346a3bd0ddbff368d0f7f8b3f3d78fc0432
Mathias Agopian [Thu, 19 Sep 2013 22:34:15 +0000 (15:34 -0700)]
am
e2a3e872: Merge "Fix GLES context version selection" into klp-dev
* commit '
e2a3e8727408937bb7107c206444fa49a150f358':
Fix GLES context version selection
Mathias Agopian [Thu, 19 Sep 2013 22:29:30 +0000 (22:29 +0000)]
Merge "Fix GLES context version selection" into klp-dev
Eino-Ville Talvala [Thu, 19 Sep 2013 21:59:51 +0000 (14:59 -0700)]
am
d171da97: GLConsumer: Add query for current frame number.
* commit '
d171da973de3c6b30263011334fdcd916739144f':
GLConsumer: Add query for current frame number.
Eino-Ville Talvala [Thu, 19 Sep 2013 20:36:07 +0000 (13:36 -0700)]
GLConsumer: Add query for current frame number.
Surface the underlying frame number of the current texture.
Bug:
10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
Mike Lockwood [Thu, 19 Sep 2013 00:06:53 +0000 (00:06 +0000)]
Merge "Add support for "input" service running as user AID_INPUT"
Mathias Agopian [Wed, 18 Sep 2013 23:20:26 +0000 (16:20 -0700)]
Fix GLES context version selection
Explicitly selects an ES 2.0 config first, then an ES 1.x config,
before attempting the fallback path for the emulator.
Bug:
10820214
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d
Mathias Agopian [Wed, 18 Sep 2013 22:36:00 +0000 (15:36 -0700)]
am
a7e1660b: am
c1c05de4: fix camera API 2.0 orientation
* commit '
a7e1660b257326f99261e7c9b2d58c9d2e68d0b0':
fix camera API 2.0 orientation
Mathias Agopian [Wed, 18 Sep 2013 22:33:38 +0000 (15:33 -0700)]
am
c1c05de4: fix camera API 2.0 orientation
* commit '
c1c05de415854eb7a13a16b7e22a22de8515123a':
fix camera API 2.0 orientation
Mike Lockwood [Fri, 13 Sep 2013 14:26:05 +0000 (07:26 -0700)]
Add support for "input" service running as user AID_INPUT
Change-Id: I8b6700c25ea2264fb3e1c16e18df281eb67b931f
Robert Craig [Mon, 29 Jul 2013 13:18:09 +0000 (09:18 -0400)]
Proper security labeling of multi-user data directories.
Add seinfo paramater to appropriate make directory
functions. This allows proper labeling for multi-user
scenarios.
Change-Id: Iaba7c40645bc7b6cc823d613da0c3782acf6ddd5
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Mathias Agopian [Wed, 18 Sep 2013 06:45:22 +0000 (23:45 -0700)]
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
Mathias Agopian [Tue, 17 Sep 2013 23:01:38 +0000 (16:01 -0700)]
am
e803e609: am
799f5126: Fix build (tests)
* commit '
e803e6095e007563df939326fdd3ca5109619a42':
Fix build (tests)
Mathias Agopian [Tue, 17 Sep 2013 22:58:55 +0000 (15:58 -0700)]
am
799f5126: Fix build (tests)
* commit '
799f51268006f319f6ae538dca670bfc7f522688':
Fix build (tests)
Mathias Agopian [Tue, 17 Sep 2013 22:55:18 +0000 (15:55 -0700)]
Fix build (tests)
Change-Id: I5b233ef448e5e7eec3818c6586dfea138b28f7b6
Mathias Agopian [Tue, 17 Sep 2013 21:35:29 +0000 (14:35 -0700)]
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.
Mathias Agopian [Tue, 17 Sep 2013 21:33:09 +0000 (14:33 -0700)]
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.
Mathias Agopian [Tue, 17 Sep 2013 21:31:13 +0000 (21:31 +0000)]
Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
Aravind Akella [Tue, 17 Sep 2013 18:26:15 +0000 (11:26 -0700)]
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.
Aravind Akella [Tue, 17 Sep 2013 18:22:59 +0000 (11:22 -0700)]
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.
Aravind Akella [Tue, 17 Sep 2013 18:17:50 +0000 (18:17 +0000)]
Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
Aravind Akella [Tue, 17 Sep 2013 17:53:50 +0000 (10:53 -0700)]
am
47e300c4: am
f0c72846: Merge "Sensor Batching Bug fixes." into klp-dev
* commit '
47e300c4b44762bcf3de2332eff1b0b00a8123e8':
Sensor Batching Bug fixes.
Aravind Akella [Tue, 17 Sep 2013 17:51:53 +0000 (10:51 -0700)]
am
f0c72846: Merge "Sensor Batching Bug fixes." into klp-dev
* commit '
f0c728465a87435e6a8a66991451cf6fe72acc24':
Sensor Batching Bug fixes.
Aravind Akella [Tue, 17 Sep 2013 17:49:26 +0000 (17:49 +0000)]
Merge "Sensor Batching Bug fixes." into klp-dev
Amith Yamasani [Tue, 17 Sep 2013 16:02:04 +0000 (09:02 -0700)]
am
3e08bb76: am
fc7083a8: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
* commit '
3e08bb7668c7d57925e393f5d27db59c10ba07eb':
Enable FEATURE_DEVICE_ADMIN for handheld devices
Amith Yamasani [Tue, 17 Sep 2013 15:58:55 +0000 (08:58 -0700)]
am
fc7083a8: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
* commit '
fc7083a828b6db00698c1418e5f370b31625213c':
Enable FEATURE_DEVICE_ADMIN for handheld devices
Amith Yamasani [Tue, 17 Sep 2013 15:56:23 +0000 (15:56 +0000)]
Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
Jesse Hall [Tue, 17 Sep 2013 03:32:34 +0000 (20:32 -0700)]
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
Jesse Hall [Tue, 17 Sep 2013 03:30:11 +0000 (20:30 -0700)]
am
2a36497e: Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
* commit '
2a36497e45d4d96e35fed89cfdcb09b71459ac3c':
Stop using default value for Surface producerControlledByApp parameter
Jesse Hall [Tue, 17 Sep 2013 03:27:15 +0000 (03:27 +0000)]
Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
Mathias Agopian [Thu, 12 Sep 2013 02:35:45 +0000 (19:35 -0700)]
Make sure do disconnect from a BQ when its client dies.
Bug:
5679534
Change-Id: If447e8673df83fe0b1d6210641e0a48522501a53
Aravind Akella [Mon, 16 Sep 2013 22:37:41 +0000 (15:37 -0700)]
Fix for AOSP fusion sensors not handling multiple clients correctly.
Bug:
10786801
Change-Id: I7b938bc583a303a30237c3d93b5accbf64cc90b5
Jesse Hall [Mon, 16 Sep 2013 22:24:53 +0000 (15:24 -0700)]
Stop using default value for Surface producerControlledByApp parameter
Bug:
10785749
Change-Id: Ifbf9340e5eabe621a69e990ec3e05ac51f8db66a
Aravind Akella [Fri, 6 Sep 2013 00:03:38 +0000 (17:03 -0700)]
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
Jesse Hall [Mon, 16 Sep 2013 19:48:38 +0000 (12:48 -0700)]
am
fccb7ac5: am
a2ba428a: Disable the egl_khr_gl_colorspace extension
* commit '
fccb7ac5968ee4cb852035b8ed93f8a21b6e7075':
Disable the egl_khr_gl_colorspace extension
Jesse Hall [Mon, 16 Sep 2013 19:44:40 +0000 (12:44 -0700)]
am
a2ba428a: Disable the egl_khr_gl_colorspace extension
* commit '
a2ba428a22125558a129c6ba4001dfc2169de2fe':
Disable the egl_khr_gl_colorspace extension
Alan Viverette [Mon, 16 Sep 2013 19:27:21 +0000 (19:27 +0000)]
Merge "Add API for pushing color transforms to SurfaceFlinger"
Jesse Hall [Sun, 15 Sep 2013 04:00:14 +0000 (21:00 -0700)]
Disable the egl_khr_gl_colorspace extension
Bug:
10777398
Change-Id: Ib50ea8b9d5d960537701b85929d6312304993a0f
Amith Yamasani [Mon, 16 Sep 2013 17:48:35 +0000 (10:48 -0700)]
Enable FEATURE_DEVICE_ADMIN for handheld devices
Bug:
9520957
Change-Id: I9c09dc726509db9e6d9ba4700255c74528b9f9fa
Alan Viverette [Fri, 13 Sep 2013 03:04:35 +0000 (20:04 -0700)]
Add API for pushing color transforms to SurfaceFlinger
BUG:
9057596
Change-Id: Iea0953366eac875b7968897a75472c25a137edb5
Mike Lockwood [Fri, 13 Sep 2013 00:19:44 +0000 (00:19 +0000)]
Merge "servicemanager: Add support for "audio" service running as AID_AUDIO user"
Kenny Root [Thu, 12 Sep 2013 18:56:46 +0000 (11:56 -0700)]
resolved conflicts for merge of
06ef81bd to master
Change-Id: Iecb252b38c98d6abe83f25927557b256183c2a01
Kenny Root [Thu, 12 Sep 2013 18:51:34 +0000 (11:51 -0700)]
resolved conflicts for merge of
1852eb4f to klp-dev-plus-aosp
Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
Kenny Root [Thu, 12 Sep 2013 18:41:19 +0000 (18:41 +0000)]
Merge "Remove copy of UniquePtr.h"
Kenny Root [Thu, 12 Sep 2013 06:25:08 +0000 (23:25 -0700)]
Use canonical UniquePtr.h file
Change-Id: Icc75bca078ffaf0c09b88ce5e897d666d1054063
Mathias Agopian [Thu, 12 Sep 2013 00:24:11 +0000 (17:24 -0700)]
am
7c4f2365: am
90ed3e8d: fix a few problems with BitTube
* commit '
7c4f236532692b847b9b103df6490549656ae993':
fix a few problems with BitTube
Mathias Agopian [Wed, 11 Sep 2013 22:06:10 +0000 (15:06 -0700)]
am
90ed3e8d: fix a few problems with BitTube
* commit '
90ed3e8d7883d9c80fb8bf11b1c593bd8b2b39d0':
fix a few problems with BitTube
Kenny Root [Wed, 11 Sep 2013 21:29:20 +0000 (14:29 -0700)]
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
Mike Lockwood [Wed, 11 Sep 2013 15:10:11 +0000 (08:10 -0700)]
servicemanager: Add support for "audio" service running as AID_AUDIO user
Change-Id: Ia41f1edd05f233ac5ce43c34eb8ab3ab76ffa194
Mathias Agopian [Tue, 10 Sep 2013 06:36:25 +0000 (23:36 -0700)]
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
Chong Zhang [Tue, 10 Sep 2013 16:50:10 +0000 (16:50 +0000)]
Merge "HDCP: add getCaps to query HDCP module capabilities"
Chong Zhang [Tue, 3 Sep 2013 21:17:58 +0000 (14:17 -0700)]
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
Mathias Agopian [Fri, 6 Sep 2013 22:09:34 +0000 (15:09 -0700)]
am
455ab58c: am
63108c34: fix a possible null dereference when eglMakeCurrent() fails
* commit '
455ab58c09bb6ba76b264523c3cd28a1a68fb5fc':
fix a possible null dereference when eglMakeCurrent() fails
Mathias Agopian [Fri, 6 Sep 2013 22:06:41 +0000 (15:06 -0700)]
am
63108c34: fix a possible null dereference when eglMakeCurrent() fails
* commit '
63108c34ec181e923b68ee840bb7960f205466a7':
fix a possible null dereference when eglMakeCurrent() fails
Mathias Agopian [Fri, 6 Sep 2013 20:36:49 +0000 (13:36 -0700)]
fix a possible null dereference when eglMakeCurrent() fails
Bug:
10648797
Change-Id: Iee0be47f2646feb25de4ea199bbb9b707452916e
Mathias Agopian [Fri, 6 Sep 2013 16:52:08 +0000 (09:52 -0700)]
am
7390e049: am
77414216: Merge "color blindness enhancement" into klp-dev
* commit '
7390e04932dc1b588967d9951eeaf0d00e8a5a83':
color blindness enhancement