Todd Poynor
1fbc0266ad
batteryservice: Add BatteryExtraProperties
...
Change-Id: I050a4da14dd723a1d563b25a9e997db769fece3e
2013-09-30 15:37:30 -07:00
Elliott Hughes
3d26c80965
am b7f3742f
: am d9be16f9
: Merge "Fix OpenGL stub exception handling."
...
* commit 'b7f3742feb0f419f9e2d7d43c6ba9dc64bb5d95c':
Fix OpenGL stub exception handling.
2013-09-27 15:40:49 -07:00
Elliott Hughes
b7f3742feb
am d9be16f9
: Merge "Fix OpenGL stub exception handling."
...
* commit 'd9be16f920f7c2581fda3ca495c1e6fc88857a6c':
Fix OpenGL stub exception handling.
2013-09-27 15:38:04 -07:00
Elliott Hughes
d9be16f920
Merge "Fix OpenGL stub exception handling."
2013-09-27 22:31:19 +00:00
Mathias Agopian
ff98f3e598
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
2013-09-26 12:47:35 -07:00
Mathias Agopian
2b3d0c4079
am 0ff4b283
: am 6da15f46
: fix crashers with wifi/virtual displays
...
* commit '0ff4b28396d77a0ed2f191836895a891108a8b5b':
fix crashers with wifi/virtual displays
2013-09-26 12:47:35 -07:00
Mathias Agopian
338acd6869
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
2013-09-26 12:44:27 -07:00
Mathias Agopian
0ff4b28396
am 6da15f46
: fix crashers with wifi/virtual displays
...
* commit '6da15f46f5f8b38e31384d641f8d3db2c3c6ea30':
fix crashers with wifi/virtual displays
2013-09-26 12:44:27 -07:00
Mathias Agopian
86206b41b2
Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
2013-09-26 19:41:22 +00:00
Mathias Agopian
8f63c2049b
fix initialization of framebuffer target crop rect on hwc 1.3
...
Bug: 10936771
Change-Id: If283e5e231ca34b93e0b1784bb4e8e4c7bfd75de
2013-09-25 20:44:34 -07:00
Mathias Agopian
6da15f46f5
fix crashers with wifi/virtual displays
...
Bug: 10647742
Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d
2013-09-25 20:40:07 -07:00
Mike Lockwood
63ff1c644f
Cleanup Binder interface between sensorservice and BatteryStats
...
Change-Id: Ia507160a2534059afe93849c8efc8407a046b50e
2013-09-25 09:28:41 -07:00
Elliott Hughes
2adde7c837
Fix OpenGL stub exception handling.
...
Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2bdc22c5fe75f5e41ffb9dd9259ae92cf8a12917
2013-09-24 17:18:05 -07:00
Nick Kralevich
b5e4762129
am e4e91c4e
: resolved conflicts for merge of e678897f
to klp-dev-plus-aosp
...
* commit 'e4e91c4ead821afb5aced2e33ee39d8878eb4d1e':
Proper security labeling of multi-user data directories.
2013-09-20 12:53:20 -07:00
Nick Kralevich
e4e91c4ead
resolved conflicts for merge of e678897f
to klp-dev-plus-aosp
...
Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70
2013-09-20 12:45:20 -07:00
Nick Kralevich
e678897f3a
Merge "Proper security labeling of multi-user data directories."
2013-09-20 19:35:36 +00:00
Mathias Agopian
1c479c56da
am 754bad45
: am d555684c
: reinstate black-screenshot debugging code
...
* commit '754bad4534e9a2de8b4e3ecbe097993c71246f91':
reinstate black-screenshot debugging code
2013-09-20 11:20:44 -07:00
Mathias Agopian
4d5755389d
am f589dd29
: am e2a3e872
: Merge "Fix GLES context version selection" into klp-dev
...
* commit 'f589dd2915587994d3dd36eff2191962fe0b71c0':
Fix GLES context version selection
2013-09-20 11:19:58 -07:00
Eino-Ville Talvala
3473e814a4
am 1160e89d
: am d171da97
: GLConsumer: Add query for current frame number.
...
* commit '1160e89d31810f2ba66f8ab502281579115b39b0':
GLConsumer: Add query for current frame number.
2013-09-20 11:19:41 -07:00
Mathias Agopian
754bad4534
am d555684c
: reinstate black-screenshot debugging code
...
* commit 'd555684cb36dfb959694db76962e570184f98838':
reinstate black-screenshot debugging code
2013-09-19 17:13:52 -07:00
Mathias Agopian
d555684cb3
reinstate black-screenshot debugging code
...
turned off by default.
Bug: 10809349
Change-Id: I3e6b8c7860e6b0e122b8f07de4020967cd1f005c
2013-09-19 17:09:26 -07:00
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
Mathias Agopian
f589dd2915
am e2a3e872
: Merge "Fix GLES context version selection" into klp-dev
...
* commit 'e2a3e8727408937bb7107c206444fa49a150f358':
Fix GLES context version selection
2013-09-19 15:34:15 -07:00
Mathias Agopian
e2a3e87274
Merge "Fix GLES context version selection" into klp-dev
2013-09-19 22:29:30 +00:00
Eino-Ville Talvala
1160e89d31
am d171da97
: GLConsumer: Add query for current frame number.
...
* commit 'd171da973de3c6b30263011334fdcd916739144f':
GLConsumer: Add query for current frame number.
2013-09-19 14:59:51 -07:00
Eino-Ville Talvala
d171da973d
GLConsumer: Add query for current frame number.
...
Surface the underlying frame number of the current texture.
Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
2013-09-19 13:36:07 -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
2185f8b420
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
2013-09-18 16:20:26 -07: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
Robert Craig
880d1a957e
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>
2013-09-18 13:21:12 +00: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