Dan Albert
c954a121e1
Add a missing include.
...
Was being included transitively by stlport.
Bug: 15193147
Change-Id: If462e5ddcf4a620367fb4b5533f44960fd3b7378
2014-11-04 22:31:05 -08:00
Michael Lentine
001ed44536
am 54430ca2
: am 793fc0e1
: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
...
* commit '54430ca2a88f57c709ea2924ea0b78820ae62643':
Fix crash when user provides large values in the Parcel.
2014-11-01 00:41:16 +00:00
Michael Lentine
54430ca2a8
am 793fc0e1
: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
...
* commit '793fc0e13d25bdecda1219999f8be2cb3c121d20':
Fix crash when user provides large values in the Parcel.
2014-11-01 00:33:29 +00:00
Michael Lentine
8afa1c4ab8
Fix crash when user provides large values in the Parcel.
...
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
2014-10-31 16:08:44 -07:00
Jesse Hall
f12f15502a
am 1834f8ea
: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
...
* commit '1834f8ea975e9a882b44dc479320fe02e306e630':
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
2014-10-30 20:58:43 +00:00
Jesse Hall
1834f8ea97
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
...
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
(cherry picked from commit 46a1f6b40e
)
2014-10-29 17:15:09 +00:00
Michael Lentine
2bb7270783
am 15b2ecf5
: am dcc959be
: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
...
* commit '15b2ecf599414c86cb198f3ffc126b50f88b5aa0':
Adding eglInitialize and eglTerminate image creation and deletion.
2014-10-21 18:43:47 +00:00
Michael Lentine
15b2ecf599
am dcc959be
: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
...
* commit 'dcc959beb77099d319a94e3985da2f4ea4064e7b':
Adding eglInitialize and eglTerminate image creation and deletion.
2014-10-21 18:35:24 +00:00
Michael Lentine
dcc959beb7
Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
2014-10-21 18:20:45 +00:00
Jesse Hall
937052fb1c
am a069e853
: am 649bafb7
: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
...
* commit 'a069e8532ba272ac5b935e332e426a3dacf827fc':
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
2014-10-20 14:31:38 +00:00
Jesse Hall
a069e8532b
am 649bafb7
: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
...
* commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed':
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
2014-10-20 14:17:18 +00:00
Jesse Hall
5b0cbcf946
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
...
On one device there is a bug, not yet root-caused, that causes fence
fds to not make it across binder from producer to consumer in the
IGraphicBufferProducer::queueBuffer call. Rather than returning an
error, which the producer typically treats as a fatal error, this
change allows the buffer to be queued with no fence. This avoids an
application crash at the risk of (likely single-frame) visible
corruption.
Bug: 17946343
Change-Id: I9ca89f94098c455e1e90f5f58d5336c936b04a9c
2014-10-19 04:57:10 +00:00
Dan Albert
fad2e3abf0
am 27b780b5
: am 9cc84950
: Merge "Don\'t check if this == NULL."
...
* commit '27b780b517eb18582f978da64febb31ecfa8e4bf':
Don't check if this == NULL.
2014-10-15 22:57:13 +00:00
Dan Albert
27b780b517
am 9cc84950
: Merge "Don\'t check if this == NULL."
...
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
Don't check if this == NULL.
2014-10-15 22:52:51 +00:00
Dan Albert
9cc849500d
Merge "Don't check if this == NULL."
2014-10-15 22:45:07 +00:00
Michael Lentine
78be65e7bf
Adding eglInitialize and eglTerminate image creation and deletion.
...
Previously it was possible to have the driver's eglTerminate called beofre
eglDestroyImageKHR in GLConsumer. This was because we didn't increment the
refcount for the lifetime of the image. This could lead to a crash or a deadlock
when multiple threads called terminate and destroy simultaneously.
Bug: 17700483
Change-Id: I7010d0f1b3db875332e95630b5e098a5564ba755
2014-10-09 10:26:37 -07:00
Jesse Hall
3dbf96cf06
am 20fca75f
: am b7702c5c
: Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev
...
* commit '20fca75fbd9141ebae6c9a28f5c09a837eb9caad':
BufferQueueProducer: Throttle EGL frame production.
2014-10-08 17:04:38 +00:00
Jesse Hall
20fca75fbd
am b7702c5c
: Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev
...
* commit 'b7702c5ce7f010fa5f19646fd79f28ff04e7014b':
BufferQueueProducer: Throttle EGL frame production.
2014-10-08 16:59:38 +00:00
Jesse Hall
b7702c5ce7
Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev
2014-10-08 16:50:13 +00:00
Aravind Akella
5b8d3eed87
am ae29ee0a
: am 93176114
: am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit 'ae29ee0a9eea291316248a90799ff28f35defeb6':
Fix sockfd leakage in SensorService.
2014-10-03 23:57:35 +00:00
Aravind Akella
ae29ee0a9e
am 93176114
: am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit '93176114cf34c9874c2db70fd7665e9f95dda9d0':
Fix sockfd leakage in SensorService.
2014-10-03 22:39:19 +00:00
Eric Penner
99a0afbaee
BufferQueueProducer: Throttle EGL frame production.
...
Throttling was previously controlled by a combination of the
driver and the number of buffers in the queue. This patch makes
a more consistent trade-off, which allows two GPU frames pending
but not three. More buffering could improve throughput in the
case of varying frame times, but this also increases latency.
Bug: 17502897
Change-Id: I4ee68019ca94c635294c5959931a555a6c4ef2df
2014-10-03 14:57:09 -07:00
Aravind Akella
a7eb4b74f7
Merge "Fix sockfd leakage in SensorService." into lmp-dev
2014-10-03 21:45:37 +00:00
Aravind Akella
8a96955c8e
Fix sockfd leakage in SensorService.
...
i) Call removeFd() only if the fd in the BitTube has been
previously added to the Looper. Use a flag to determine whether the fd
has been previously added or not.
ii) Increment mPendingFlushEventsToSend after holding a connectionLock.
iii) Store the number of acks that are pending in SensorEventQueue
and send them all at once.
Bug: 17472228
Change-Id: I1ec834fea1112a9cfbd9cddd2198438793698502
2014-10-02 18:59:56 -07:00
Jesse Hall
6051dc2fcc
am 8619132f
: am 74efd6e6
: am f05ef4e5
: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
...
* commit '8619132f167afab3775315acdf6e7097fff41a91':
Surface: cancel the dequeued buffer when requestBuffer fails
2014-10-02 23:46:41 +00:00
Jesse Hall
8619132f16
am 74efd6e6
: am f05ef4e5
: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
...
* commit '74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad':
Surface: cancel the dequeued buffer when requestBuffer fails
2014-10-02 23:43:31 +00:00
Jesse Hall
9f5a1b6abd
Surface: cancel the dequeued buffer when requestBuffer fails
...
Partial fix for bug: 17477219
Change-Id: Ibf5a9e26e02c4be8854925a77a70f5c9c7dcf6f2
2014-10-02 18:16:19 +00:00
Dan Albert
5193aea69a
am 56b3f887
: am 6ee97e74
: Merge "Fix a null dereference."
...
* commit '56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da':
Fix a null dereference.
2014-09-23 20:55:50 +00:00
Dan Albert
56b3f887a2
am 6ee97e74
: Merge "Fix a null dereference."
...
* commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f':
Fix a null dereference.
2014-09-23 17:54:39 +00:00
Dan Albert
c78a0c1733
Fix a null dereference.
...
Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
2014-09-23 09:51:51 -07:00
Lajos Molnar
147372fdf9
resolved conflicts for merge of 67d8bd66
to lmp-mr1-dev-plus-aosp
...
Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc
2014-09-19 06:23:46 -07:00
Lajos Molnar
e7bda06398
resolved conflicts for merge of 67d8bd66
to lmp-dev-plus-aosp
...
Change-Id: Idbe39c6de8fe31ac57a9238c18b4c20d66dc73ad
2014-09-18 20:05:27 -07:00
Lajos Molnar
67d8bd66aa
surfaceflinger: add getDisplayStats() method
...
This is used by media service to schedule video frames at the
proper time, based on precise vsync timings.
Bug: 14659809
Change-Id: I1a90603f3dc09dca9aa4f90a3aa845fab56e0a5e
2014-09-18 17:03:20 -07:00
Dan Albert
1474f8864f
Don't check if this == NULL.
...
Entering a method with this == NULL is undefined behavior. Clang whines
about this.
Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
2014-09-16 17:52:06 -07:00
Dan Albert
94ba882df2
am 4355c0c9
: am e1e3d278
: Merge "Clean cruft out of makefiles."
...
* commit '4355c0c98644c37f0511257403bbfb71b342e2df':
Clean cruft out of makefiles.
2014-09-12 19:28:17 +00:00
Aravind Akella
f627c969e1
am 3d0daa57
: am 8493b79e
: SensorService fixes
...
* commit '3d0daa57f5f180418fdecbf06f6a5a41e566f6d9':
SensorService fixes
2014-09-12 19:20:58 +00:00
Dan Albert
4355c0c986
am e1e3d278
: Merge "Clean cruft out of makefiles."
...
* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
Clean cruft out of makefiles.
2014-09-12 16:22:03 +00:00
Aravind Akella
3d0daa57f5
am 8493b79e
: SensorService fixes
...
* commit '8493b79e1cff92450076ca7450c4bf4e434a6816':
SensorService fixes
2014-09-12 05:36:58 +00:00
Dan Albert
b79dfe6721
Clean cruft out of makefiles.
...
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).
Change-Id: I157309d702e59152adfa3450939082248ae4c043
2014-09-11 18:49:47 -07:00
Aravind Akella
8493b79e1c
SensorService fixes
...
i) Significant Motion multiple clients fix. Make a copy of
mActiveConnections vector before cleaning up SensorEventConnections
when one-shot sensors trigger.
ii) Maintain a mapping between flush_complete_events and
SensorEventConnections to accurately map flush() API calls and
corresponding flush_complete_events
iii) Remove all references to 1_1 and 1_2 HALs.
iv) Dynamically allocate sensor_event buffers in SensorService main
threadLoop.
Bug: 17412359
Change-Id: If3c3986197660cafef2d2e0b4dc7582e229cf1c4
2014-09-10 18:24:18 -07:00
Riley Andrews
03c2e83e73
am 75ec33e0
: am d15ef27f
: Update ScreenshotClient to take advantage of rotation in surfaceflinger\'s screencap api
...
* commit '75ec33e0e609e3ef074f4230c2227e52bf82ad06':
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
2014-09-09 22:16:46 +00:00
Riley Andrews
25d10ce9ec
am 129dc842
: am edb86f9f
: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
...
* commit '129dc8423da319d42af6ef71046c39ba59c0d878':
Add rotation to surfaceflingers screen cap.
2014-09-09 22:16:38 +00:00
Riley Andrews
75ec33e0e6
am d15ef27f
: Update ScreenshotClient to take advantage of rotation in surfaceflinger\'s screencap api
...
* commit 'd15ef27f9b13727fa7358e3c09572f66bb1e0668':
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
2014-09-09 21:55:45 +00:00
Riley Andrews
129dc8423d
am edb86f9f
: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
...
* commit 'edb86f9f681e082a64a670814ee4d73ccf39942a':
Add rotation to surfaceflingers screen cap.
2014-09-09 21:55:26 +00:00
Riley Andrews
d15ef27f9b
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
...
Change-Id: I836649d9d5cd5958ce34e47f26f4a36d2d05d24c
2014-09-09 19:41:32 +00:00
Dan Albert
58a81ba506
am 5273a978
: resolved conflicts for merge of 86aeb9ef
to lmp-dev-plus-aosp
...
* commit '5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c':
Make string literal concatenation play nice with C++11.
2014-09-09 05:25:03 +00:00
Dan Albert
5273a97833
resolved conflicts for merge of 86aeb9ef
to lmp-dev-plus-aosp
...
Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
2014-09-08 22:15:20 -07:00
Riley Andrews
c3ebe66b49
Add rotation to surfaceflingers screen cap.
...
+ This is needed so that activity manager does not
have to do cpu side rotations when capturing recents
thumbnails.
Change-Id: If998008e675ad01305db8399fd643cf4608b7025
2014-09-09 03:51:16 +00:00
Dan Albert
8b49125f10
Make string literal concatenation play nice with C++11.
...
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.
Change-Id: I2741f5be9c0b1562e0f413d1309ef9d687e89b41
2014-09-08 18:53:39 -07:00
Jesse Hall
46a1f6b40e
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
...
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
2014-09-04 10:07:28 -07:00