Dan Stoza
f10c46ef85
Enable clang for libui/libgui/surfaceflinger
...
Enables clang and C++11 for libui/libgui/surfaceflinger, and
eliminates all compile-time warnings.
Change-Id: Ie237fdb5ae44f2bfcddaa884f9c65ec3f08ae50f
2014-11-11 14:28:22 -08:00
Craig Mautner
0c17a2b2ea
Stop consuming input on error dialogs.
...
This code is no longer necessary and was preventing input from
reaching their desired windows. See bug 17648830.
Change-Id: Ib1c026ece70e6fa98343340b89af4199d6d0ffca
2014-11-11 14:05:03 -08:00
Aravind Akella
e75a9a26ee
am 686edee8
: am a2614354
: Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
...
* commit '686edee8e9894363caf8f01b370a6d3c9bc13e91':
Add a timeout for releasing SensorService wake_lock.
2014-11-07 22:08:47 +00:00
Aravind Akella
686edee8e9
am a2614354
: Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
...
* commit 'a26143546e4665cc3b07d6527b63a2e4bb04fb9f':
Add a timeout for releasing SensorService wake_lock.
2014-11-07 22:01:03 +00:00
Aravind Akella
a26143546e
Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
2014-11-07 21:47:49 +00:00
Dan Stoza
6b7a45859e
am 8e624d4c
: am 98d20f82
: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
...
* commit '8e624d4cad45532c09879356f3adaa3b65fdcfc9':
Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:09:39 +00:00
Dan Stoza
8e624d4cad
am 98d20f82
: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
...
* commit '98d20f82ca8979b30c81df9639f54ab11e1951f9':
Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:03:42 +00:00
Dan Stoza
98d20f82ca
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
2014-11-07 19:44:31 +00:00
Dan Stoza
8dc55396fc
Add a BufferItem parameter to onFrameAvailable
...
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents. Also
adds an onFrameReplaced callback, which is necessary if the consumer
wants to do anything more than simple queue length tracking.
Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
2014-11-07 10:39:13 -08:00
Naseer Ahmed
1b89fe0b81
am ff520bb9
: am 7aa0c47e
: sf: Add a NULL check in getDisplayConfigs
...
* commit 'ff520bb93812f9892da526ace81efce9b0872503':
sf: Add a NULL check in getDisplayConfigs
2014-11-04 01:18:08 +00:00
Naseer Ahmed
ff520bb938
am 7aa0c47e
: sf: Add a NULL check in getDisplayConfigs
...
* commit '7aa0c47e4205c6fca136c38f272d911c25c8a8fa':
sf: Add a NULL check in getDisplayConfigs
2014-11-03 22:31:50 +00:00
Naseer Ahmed
7aa0c47e42
sf: Add a NULL check in getDisplayConfigs
...
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).
Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)
Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
2014-11-03 12:16:18 -08:00
Aravind Akella
b4373ac9f5
Add a timeout for releasing SensorService wake_lock.
...
If SensorService is holding a wake_lock and there are no acknowledgements
from ANY app within 5 seconds, release the wake_lock and reset the wake_lock
refcounts for all connections.
Bug: 16874240
Change-Id: I5e950dd393c20173c439cbd5a4ba614ee09d61f4
2014-11-01 18:19:25 -07:00
Jesse Hall
b43a1c9be2
am affc4d80
: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
...
* commit 'affc4d809edbcb3b0e49e5ccc9821b9695a57d44':
surfaceflinger: fix -Wunused-parameter warning
2014-10-31 22:57:44 +00:00
Jesse Hall
18b846dda7
am c7636f60
: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
...
* commit 'c7636f606270a4b79d745ec1acf049daedfa0e2f':
surfaceflinger: fix -Wsign-compare warnings
2014-10-31 22:57:43 +00:00
Jesse Hall
9fc06c5e21
am 6e74e3cc
: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
...
* commit '6e74e3ccd972fe90d9998f6b683e25dca38f470d':
surfaceflinger: fix -Woverloaded-virtual warning
2014-10-31 22:57:42 +00:00
Jesse Hall
7cd85979e8
surfaceflinger: fix -Wunused-parameter warning
...
warning: unused parameter 'mustRecompose' [-Wunused-parameter]
Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
(cherry picked from d2e514f717
)
2014-10-31 09:52:42 -07:00
Jesse Hall
7844211607
surfaceflinger: fix -Wsign-compare warnings
...
warning: comparison of integers of different signs: 'int' and 'size_t'
(aka 'unsigned int') [-Wsign-compare]
arning: comparison of integers of different signs: 'int32_t' (aka
'int') and 'const uint32_t' (aka 'const unsigned int')
[-Wsign-compare]
Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2
(cherry picked from f9bfdc6c94
)
2014-10-31 09:52:23 -07:00
Jesse Hall
9b901805ed
surfaceflinger: fix -Woverloaded-virtual warning
...
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]
Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
(cherry picked from commit 382574d116
)
2014-10-31 09:52:08 -07:00
Jesse Hall
1495ceb885
surfaceflinger: fix -Wmismatched-tags warnings
...
warning: struct 'HWComposer' was previously declared as a class
[-Wmismatched-tags]
warning: class 'DisplayInfo' was previously declared as a struct
[-Wmismatched-tags]
Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e
(cherry picked from commit 646f541050
)
2014-10-31 09:51:10 -07:00
Dan Stoza
30d382613e
am d7702163
: am 1f3efb11
: Don\'t run large virtual displays through HWC
...
* commit 'd77021637e28e66be3fcc097b16869df69717df9':
Don't run large virtual displays through HWC
2014-10-30 21:06:46 +00:00
Dan Stoza
d77021637e
am 1f3efb11
: Don\'t run large virtual displays through HWC
...
* commit '1f3efb11ff8c884a254f4272f0d1ee0b77ceff2f':
Don't run large virtual displays through HWC
2014-10-30 20:58:42 +00:00
Dan Stoza
1f3efb11ff
Don't run large virtual displays through HWC
...
This change watches for a MAX_VIRTUAL_DISPLAY_DIMENSION value, which
will be set (if necessary) in BoardConfig.mk. If the value is set,
any virtual displays that have a width or a height greater than that
dimension will bypass the hardware composer HAL and be handled only
by SurfaceFlinger.
Bug: 17701816
Change-Id: Ia6ca44dfd6a7a9bc0f054493d3f13006bc32fa14
2014-10-28 16:01:47 -07:00
Riley Andrews
b9b24e503f
am 0b91d7e2
: am 131866e1
: Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev
...
* commit '0b91d7e27718fc530bcad78a7ff2a51b90142059':
Add glFlush in surfaceflinger screenshot code.
2014-10-24 18:43:37 +00:00
Riley Andrews
0b91d7e277
am 131866e1
: Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev
...
* commit '131866e1a4cb3c592f923e95a8c1a66291e2057a':
Add glFlush in surfaceflinger screenshot code.
2014-10-24 18:39:16 +00:00
Riley Andrews
131866e1a4
Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev
2014-10-24 18:30:07 +00:00
Riley Andrews
9707f4df64
Add glFlush in surfaceflinger screenshot code.
...
After creating a syncKHR object with type EGL_SYNC_NATIVE_FENCE_ANDROID,
glFlush must be called before the EGL_SYNC_NATIVE_FENCE_FD_ANDROID attribute
is populated with a sync fd. We currently call eglDupNativeFenceFDANDROID
before issuing the flush.
Bug 18052459
Taken verbatim from matthew.k.gumbel@intel.com .
Change-Id: I3781d14f92862076e2bca7d27341a6dc6e7e3775
2014-10-23 16:25:17 -07:00
Jesse Hall
2d970420c5
am 11f2e08a
: am 8ad8c0a7
: am afe2b1fa
: surfaceflinger: don\'t close fence fds after passing to queueBuffer
...
* commit '11f2e08a66f2463cbfd9cbef5c34da7ddfe2613a':
surfaceflinger: don't close fence fds after passing to queueBuffer
2014-10-22 22:40:43 +00:00
Jesse Hall
11f2e08a66
am 8ad8c0a7
: am afe2b1fa
: surfaceflinger: don\'t close fence fds after passing to queueBuffer
...
* commit '8ad8c0a775a1d4592479731973238b82480f76b2':
surfaceflinger: don't close fence fds after passing to queueBuffer
2014-10-22 21:27:11 +00:00
Jesse Hall
8ad8c0a775
am afe2b1fa
: surfaceflinger: don\'t close fence fds after passing to queueBuffer
...
* commit 'afe2b1fadd29149ceed639357e44e06e97c3a5ca':
surfaceflinger: don't close fence fds after passing to queueBuffer
2014-10-22 20:45:35 +00:00
Jesse Hall
afe2b1fadd
surfaceflinger: don't close fence fds after passing to queueBuffer
...
ANativeWindow::queueBuffer takes ownership of the fence fd passed to
it, and will close it before returning. SurfaceFlinger's screenshot
code was also closing the syncFd it passed to queueBuffer. Most of the
time this meant the second close() silently failed, but in a rare race
condition the file descriptor could be reused between the two
close()s.
Bug: 17946343
Change-Id: Ib74fcb1dce52cc21328059c99b7c4c76f41aa3a5
2014-10-21 11:11:53 -07:00
Dmitriy Ivanov
68b769974d
am 8b81ce56
: am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit '8b81ce563f03500064e0f4c87288b8eeb3bed496':
Switch to libsigchain.a
2014-10-21 03:54:05 +00:00
Dmitriy Ivanov
8b81ce563f
am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
2014-10-21 03:30:55 +00:00
Dmitriy Ivanov
5cf92d4a85
am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
2014-10-21 03:30:18 +00:00
Dmitriy Ivanov
4340a14fbf
Switch to libsigchain.a
...
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
Change-Id: I0e41cf173be96c52cdad72b1ef4a1bf819e65dd2
2014-10-20 14:17:26 -07:00
Dmitriy Ivanov
042e5078f7
Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev
2014-10-20 17:14:44 +00:00
Aravind Akella
f88c64809a
am f65fba5c
: am 899891ec
: am 0b6acb22
: Add version number to SensorService dump output.
...
* commit 'f65fba5cc9b88decc16660068edf878222ebb146':
Add version number to SensorService dump output.
2014-10-19 21:28:34 +00:00
Aravind Akella
f65fba5cc9
am 899891ec
: am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '899891ec95c0581d35f47db7bdea75bd49fdca1b':
Add version number to SensorService dump output.
2014-10-19 21:23:55 +00:00
Aravind Akella
899891ec95
am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '0b6acb2231baed861488f2d181621272d0658d25':
Add version number to SensorService dump output.
2014-10-19 21:14:54 +00:00
Aravind Akella
433fe2af0d
am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '0b6acb2231baed861488f2d181621272d0658d25':
Add version number to SensorService dump output.
2014-10-19 21:05:16 +00:00
Aravind Akella
0b6acb2231
Add version number to SensorService dump output.
...
Change-Id: I64f9482ade523ec3fafe14bff14db7196e32413f
2014-10-19 20:30:58 +00:00
Narayan Kamath
6e6d754ecc
am 39efe3e5
: Clean up unused parameter warnings.
...
* commit '39efe3e5bf6282a4851e0eb3b938060c8f7790ae':
Clean up unused parameter warnings.
2014-10-17 11:22:05 +00:00
Narayan Kamath
39efe3e5bf
Clean up unused parameter warnings.
...
Manual application of change 692018430f115343e36b0680acc659f2a731a5d7.
Change-Id: I100f838d70e591a13abb198dc420000ef114a429
(cherry picked from commit 97a3367a1b
)
2014-10-17 10:12:58 +00:00
Narayan Kamath
97a3367a1b
Clean up unused parameter warnings.
...
Manual application of change 692018430f115343e36b0680acc659f2a731a5d7.
Change-Id: I100f838d70e591a13abb198dc420000ef114a429
2014-10-17 10:37:08 +01:00
Dmitriy Ivanov
2b1f2dac93
Link sigchain to surfaceflinger main executable
...
And export necessary symbols to preempt calls from libart.so
Bug: 15345057
Bug: 15426766
(cherry picked from commit f3da24d8cf
)
Change-Id: I03b632e0bf2cbaf4a0e68cd0af4e991f7f6b08e4
2014-10-16 11:43:19 -07: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
759115cd6d
am 9cc84950
: Merge "Don\'t check if this == NULL."
...
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
Don't check if this == NULL.
2014-10-15 22:52:43 +00:00
Dan Albert
9cc849500d
Merge "Don't check if this == NULL."
2014-10-15 22:45:07 +00:00
Dmitriy Ivanov
86636a988f
am 88e5118f
: am 26a28149
: Merge "Link sigchain to surfaceflinger main executable"
...
* commit '88e5118f07f38c96d5b438a44c42b0951c65ba0d':
Link sigchain to surfaceflinger main executable
2014-10-14 19:05:26 +00:00
Dmitriy Ivanov
9b9d1a4ee5
am 26a28149
: Merge "Link sigchain to surfaceflinger main executable"
...
* commit '26a2814963de75f14dfbe7cf3d45e993727891cf':
Link sigchain to surfaceflinger main executable
2014-10-14 18:21:44 +00:00
Dmitriy Ivanov
88e5118f07
am 26a28149
: Merge "Link sigchain to surfaceflinger main executable"
...
* commit '26a2814963de75f14dfbe7cf3d45e993727891cf':
Link sigchain to surfaceflinger main executable
2014-10-14 18:21:24 +00:00
Jeff Brown
27d0e598fd
am 465c8f13
: am 2e5f8eaa
: am ffb49774
: Improve ANR diagnostics.
...
* commit '465c8f1387b231133fb29bdeb0eb685c30e8da00':
Improve ANR diagnostics.
2014-10-12 16:12:42 +00:00
Jeff Brown
465c8f1387
am 2e5f8eaa
: am ffb49774
: Improve ANR diagnostics.
...
* commit '2e5f8eaa7dbb43e5a46eda7a3d1d895f7584a122':
Improve ANR diagnostics.
2014-10-12 16:10:21 +00:00
Jeff Brown
2e5f8eaa7d
am ffb49774
: Improve ANR diagnostics.
...
* commit 'ffb497743831ae4857b674629b58ea3c46d01431':
Improve ANR diagnostics.
2014-10-12 16:02:22 +00:00
Jeff Brown
1222c8944a
am ffb49774
: Improve ANR diagnostics.
...
* commit 'ffb497743831ae4857b674629b58ea3c46d01431':
Improve ANR diagnostics.
2014-10-12 16:01:36 +00:00
Jeff Brown
ffb4977438
Improve ANR diagnostics.
...
Print more details about the exact reason that an ANR has occurred.
Also start checking that the window actually has a registered
input connection that is not in a broken state. These windows
are supposed to be cleaned up by the window manager promptly
as if the app had crashed but the pattern of ANRs we are observing
suggests that broken windows might be sticking around longer than
they should.
Bug: 17721767
Change-Id: Ie2803a3fa9642381ecadc198fec15e1b70d93c20
2014-10-10 19:09:39 -07:00
Dmitriy Ivanov
f3da24d8cf
Link sigchain to surfaceflinger main executable
...
And export necessary symbols to preempt calls from libart.so
Bug: 15345057
Bug: 15426766
Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
2014-10-09 15:20:25 -07:00
Aravind Akella
011f187373
am e19c39dc
: am 5acc751f
: am 7830ef3d
: Change ordering of memory allocation and calling Thread::run().
...
* commit 'e19c39dccd0cdbbcbe27dd90f224b2012b7dfb74':
Change ordering of memory allocation and calling Thread::run().
2014-10-08 13:14:37 +00:00
Aravind Akella
e19c39dccd
am 5acc751f
: am 7830ef3d
: Change ordering of memory allocation and calling Thread::run().
...
* commit '5acc751ffea2fab38f7fcc4e06866640e70174e4':
Change ordering of memory allocation and calling Thread::run().
2014-10-08 07:51:58 +00:00
Aravind Akella
5acc751ffe
am 7830ef3d
: Change ordering of memory allocation and calling Thread::run().
...
* commit '7830ef3dd0ff3749d974c2dd85a8fa59dc47aeca':
Change ordering of memory allocation and calling Thread::run().
2014-10-08 05:24:50 +00:00
Aravind Akella
a046f506a5
am 7830ef3d
: Change ordering of memory allocation and calling Thread::run().
...
* commit '7830ef3dd0ff3749d974c2dd85a8fa59dc47aeca':
Change ordering of memory allocation and calling Thread::run().
2014-10-08 00:03:48 +00:00
Aravind Akella
7830ef3dd0
Change ordering of memory allocation and calling Thread::run().
...
In some cases this is causing a crash as device.poll is called with
NULL.
Bug: 17896339
Change-Id: Id431599f2c661338c355c7081b6602f8449a9198
2014-10-07 21:20:12 +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
Aravind Akella
93176114cf
am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit 'a7eb4b74f74423dafd88adf94a7984ae927c3a23':
Fix sockfd leakage in SensorService.
2014-10-03 21:54:29 +00:00
Aravind Akella
021543fc65
am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit 'a7eb4b74f74423dafd88adf94a7984ae927c3a23':
Fix sockfd leakage in SensorService.
2014-10-03 21:50:52 +00:00
Aravind Akella
a7eb4b74f7
Merge "Fix sockfd leakage in SensorService." into lmp-dev
2014-10-03 21:45:37 +00:00
Michael Lentine
50160cedf6
am fb992b77
: am 6c925ede
: Fixed discrepancy between crop and frame transparencies.
...
* commit 'fb992b7753d73f4f18ef7aa1c8e3df5c09e6efbd':
Fixed discrepancy between crop and frame transparencies.
2014-10-03 21:10:48 +00:00
Michael Lentine
fb992b7753
am 6c925ede
: Fixed discrepancy between crop and frame transparencies.
...
* commit '6c925ede620f4080227bb1fe8a41e4b4502348f8':
Fixed discrepancy between crop and frame transparencies.
2014-10-03 21:03:11 +00:00
Michael Lentine
6c925ede62
Fixed discrepancy between crop and frame transparencies.
...
Bug: 17662777
Change-Id: I0d65d9b912a37a60e4c1d2e2e198f7709460917c
2014-10-03 19:02:30 +00:00
Riley Andrews
8dcdf7961b
am 6747be9f
: Generate the SurfaceFlinger shader cache on initialization
...
* commit '6747be9fab9981ec24729cede5e0fe779e8b8914':
Generate the SurfaceFlinger shader cache on initialization
2014-10-03 17:26:52 +00:00
Riley Andrews
6747be9fab
Generate the SurfaceFlinger shader cache on initialization
...
Blobcache is not yet enabled for surfaceflinger (as it should be).
As a temporary workaround, generate all needed shaders during
surfaceflinger initialization instead of doing the compilation
on-demand during ui transitions.
Change-Id: I14455b20a3f85f177d85c9c8b76d8ccc35379b39
2014-10-03 17:21:15 +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
Riley Andrews
da6064c485
am 36a4d171
: am 6c833986
: Merge "Generate the SurfaceFlinger shader cache on initialization" into lmp-mr1-dev
...
* commit '36a4d17104f8a8d4523071d829ac43c8507ced64':
Generate the SurfaceFlinger shader cache on initialization
2014-10-02 23:46:40 +00:00
Riley Andrews
36a4d17104
am 6c833986
: Merge "Generate the SurfaceFlinger shader cache on initialization" into lmp-mr1-dev
...
* commit '6c8339867438c27e468a03995b98481e9e49b274':
Generate the SurfaceFlinger shader cache on initialization
2014-10-02 20:26:21 +00:00
Michael Lentine
e950f3f2b7
am 6bddbeae
: am db57cfbd
: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
...
* commit '6bddbeaeb05aff19a8d69fda806c2b03b2c47c6c':
When eglMakeCurrent fails we need to fix the egl state.
2014-10-02 12:53:50 +00:00
Jesse Hall
18507fe470
am c868c78b
: am 5bf786d8
: surfaceflinger: recompute visibility after sideband stream change
...
* commit 'c868c78b516d5fd3f5d36dc916baab6c98800d8f':
surfaceflinger: recompute visibility after sideband stream change
2014-10-02 12:53:49 +00:00
Michael Lentine
6bddbeaeb0
am db57cfbd
: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
...
* commit 'db57cfbd6f9d5795846ef237fd297cb81e429679':
When eglMakeCurrent fails we need to fix the egl state.
2014-10-02 12:41:27 +00:00
Jesse Hall
c868c78b51
am 5bf786d8
: surfaceflinger: recompute visibility after sideband stream change
...
* commit '5bf786d8f00ff8eee64ebf330dac55e33a0f97b1':
surfaceflinger: recompute visibility after sideband stream change
2014-10-02 12:40:05 +00:00
Aravind Akella
62500f37a5
am ca5eacb5
: am deb71b28
: Merge "Fix a possible SensorService deadlock." into lmp-dev
...
* commit 'ca5eacb530fbb5e32564589cd29545df5805e339':
Fix a possible SensorService deadlock.
2014-10-02 02:00:11 +00:00
Jesse Hall
13ba2b0274
am 17290d48
: am bacc28ef
: surfaceflinger: Use landscape resolution for default dpi
...
* commit '17290d483b986a9838aeeb85386c14681d0d5c44':
surfaceflinger: Use landscape resolution for default dpi
2014-10-02 02:00:10 +00:00
Riley Andrews
a51fafc4d8
Generate the SurfaceFlinger shader cache on initialization
...
Blobcache is not yet enabled for surfaceflinger (as it should be).
As a temporary workaround, generate all needed shaders during
surfaceflinger initialization instead of doing the compilation
on-demand during ui transitions.
Change-Id: I14455b20a3f85f177d85c9c8b76d8ccc35379b39
2014-10-02 01:30:28 +00:00
Aravind Akella
ca5eacb530
am deb71b28
: Merge "Fix a possible SensorService deadlock." into lmp-dev
...
* commit 'deb71b2812702318900c36b7bcfa9759525ea7cc':
Fix a possible SensorService deadlock.
2014-10-02 00:57:48 +00:00
Jesse Hall
17290d483b
am bacc28ef
: surfaceflinger: Use landscape resolution for default dpi
...
* commit 'bacc28ef1df329f4dc21bae44b09a6c5018af908':
surfaceflinger: Use landscape resolution for default dpi
2014-10-02 00:57:47 +00:00
Michael Lentine
20daf003aa
am db57cfbd
: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
...
* commit 'db57cfbd6f9d5795846ef237fd297cb81e429679':
When eglMakeCurrent fails we need to fix the egl state.
2014-10-01 22:50:32 +00:00
Michael Lentine
db57cfbd6f
Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
2014-10-01 22:44:46 +00:00
Jesse Hall
e245cdcc00
am 5bf786d8
: surfaceflinger: recompute visibility after sideband stream change
...
* commit '5bf786d8f00ff8eee64ebf330dac55e33a0f97b1':
surfaceflinger: recompute visibility after sideband stream change
2014-10-01 22:38:18 +00:00
Michael Lentine
3f121fc650
When eglMakeCurrent fails we need to fix the egl state.
...
Bug: 16676660
Change-Id: Ie7bee9c78378b9e9206060444319e6ee35e1ab74
2014-10-01 14:50:58 -07:00
Jesse Hall
5bf786d8f0
surfaceflinger: recompute visibility after sideband stream change
...
We normally recompute layer visibility when a layer gets its first
buffer; before then it's treated as invisible. Sideband layers never
get a buffer (as far as SurfaceFlinger knows), so never became
visible. Now we also recompute visibility when a layer gets a new
sideband stream.
Bug: 17752511
Change-Id: I84e150f196eb2eb7bcd2616248e5e3fa73624809
2014-10-01 09:00:34 -07:00
Aravind Akella
f7ebef9890
am b17044ad
: am 71e351d9
: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
...
* commit 'b17044adcf951b66ce2ecb7f7835572d7448bd64':
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
2014-09-29 19:45:08 +00:00
Aravind Akella
112a7457ae
am deb71b28
: Merge "Fix a possible SensorService deadlock." into lmp-dev
...
* commit 'deb71b2812702318900c36b7bcfa9759525ea7cc':
Fix a possible SensorService deadlock.
2014-09-29 00:56:17 +00:00
Jesse Hall
2a8ae4ef70
am bacc28ef
: surfaceflinger: Use landscape resolution for default dpi
...
* commit 'bacc28ef1df329f4dc21bae44b09a6c5018af908':
surfaceflinger: Use landscape resolution for default dpi
2014-09-29 00:56:04 +00:00
Aravind Akella
deb71b2812
Merge "Fix a possible SensorService deadlock." into lmp-dev
2014-09-29 00:49:26 +00:00
Jesse Hall
bacc28ef1d
surfaceflinger: Use landscape resolution for default dpi
...
When HWC doesn't provide DPI values for a display, we pick a default
DPI based on resolution. The intent was that 1080p and higher displays
would get XHIGH density, and lower resolutions would get TV density.
In KK (and possibly forever) we had a bug that we'd always use TV
density. That was fixed in L, but that fix exposed a pre-existing bug
that we always used the display's height in its native orientation,
rather than in landscape orientation. So an 800x1280 tablet like N7v1
started getting XHIGH density instead of the intended TV density.
Bug: 17461633
Change-Id: Ia57fa49e61f36bdda63ce283ef62c9953297222c
2014-09-28 22:26:28 +00:00
Aravind Akella
e148bc29c2
Fix a possible SensorService deadlock.
...
If the destructor of SensorEventConnection gets called when the main
sendEvents loop of SensorService is executing it may result in a deadlock.
The loop promotes each connection to a strong_pointer, calls sendEvents
and cleans up the connection if necessary. It is possible that the sp's
destructor may delete SensorEventConnection which will call the dtor
~SensorEventConnection(). This dtor again needs SensorService mLock to
execute which may result in a deadlock.
Bug: 17617897
Change-Id: I76c244dbe85fadb591c0bd1a9a5eb01d93f56505
2014-09-28 21:26:49 +00:00
Aravind Akella
b17044adcf
am 71e351d9
: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
...
* commit '71e351d96b551ccdbc39b52a0c66da86cae83701':
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
2014-09-27 06:17:21 +00:00
Aravind Akella
bea1db57de
am 71e351d9
: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
...
* commit '71e351d96b551ccdbc39b52a0c66da86cae83701':
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
2014-09-27 02:46:32 +00:00
Aravind Akella
71e351d96b
Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
2014-09-27 02:09:30 +00:00
Aravind Akella
678f4fce90
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
...
This reverts commit 5105960d49
.
Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0
2014-09-27 02:06:32 +00:00
Michael Wright
9bd5bcc958
am 2344006b
: am 4b20d402
: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
...
* commit '2344006b6e43ffd081f55228d150f26d932f15fe':
Only mark repeated keys as PASS_TO_USER if the original key was.
2014-09-26 15:28:58 +00:00
Jesse Hall
a5e4b70352
am 53e6b95d
: am 728a8da1
: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
...
* commit '53e6b95d05da4e3c4e0fcd9a0d1ed7d56a6814a1':
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
2014-09-26 15:28:57 +00:00
Michael Wright
2344006b6e
am 4b20d402
: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
...
* commit '4b20d40218a25adcad21cc135a3103b4e04940f3':
Only mark repeated keys as PASS_TO_USER if the original key was.
2014-09-26 05:10:08 +00:00
Jesse Hall
53e6b95d05
am 728a8da1
: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
...
* commit '728a8da14638e718ede11a7a894705524fc9d171':
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
2014-09-26 05:10:07 +00:00
Michael Wright
cfbc36544e
am 4b20d402
: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
...
* commit '4b20d40218a25adcad21cc135a3103b4e04940f3':
Only mark repeated keys as PASS_TO_USER if the original key was.
2014-09-26 01:47:01 +00:00
Jesse Hall
1b5c8839f7
am 728a8da1
: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
...
* commit '728a8da14638e718ede11a7a894705524fc9d171':
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
2014-09-26 01:47:00 +00:00
Michael Wright
4b20d40218
Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
2014-09-26 01:38:57 +00:00
Michael Wright
2e732956ad
Only mark repeated keys as PASS_TO_USER if the original key was.
...
Bug: 17629695
Change-Id: Ic569aba4149c6cc321c2cf8aede7c5e8a1196234
2014-09-25 13:20:20 -07:00
Jesse Hall
728a8da146
Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
2014-09-24 22:07:01 +00:00
Aravind Akella
c4c63f21dd
am 8f12365b
: am 5105960d
: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
...
* commit '8f12365b768a05e7e28094e3e90ff01afca284ba':
Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
2014-09-24 17:18:20 +00:00
Aravind Akella
8f12365b76
am 5105960d
: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
...
* commit '5105960d49bfa86efeeea8f87c87aa96b5771c37':
Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
2014-09-24 04:24:07 +00:00
Aravind Akella
8b4869dc83
am 5105960d
: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
...
* commit '5105960d49bfa86efeeea8f87c87aa96b5771c37':
Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
2014-09-24 03:48:09 +00:00
chenhg
0ea1cb9195
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
...
BUG: 17382907
Change-Id: I65fd037bd25238ae68a3976468ae7fd7ce49c562
2014-09-23 17:26:00 -07:00
Aravind Akella
5105960d49
Fix sockfd leakage in SensorService. Remove sockfd from Looper
...
when the connection is removed from mActiveConnections.
Bug: 17472228
Change-Id: Iaabe0968bd2104ef961ff5e8659bf91712e2e1db
2014-09-23 23:46:22 +00: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
435d9cde27
resolved conflicts for merge of 67d8bd66
to lmp-dev-plus-aosp
...
Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6
2014-09-18 20:09:39 -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
Aravind Akella
11b4fd5602
am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'e225f6fd4a3f17c2705f1d69b176db475a3cc821':
SensorService fixes.
2014-09-16 21:05:01 +00:00
Aravind Akella
7f2737807f
am c8a1b367
: am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'c8a1b36745e2094e5fdc7915739caca396c2d9de':
SensorService fixes.
2014-09-16 09:11:14 +00:00
Aravind Akella
c8a1b36745
am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'e225f6fd4a3f17c2705f1d69b176db475a3cc821':
SensorService fixes.
2014-09-16 08:57:56 +00:00
Aravind Akella
0ec2066e47
SensorService fixes.
...
i) Initialize sensor_event.flags to zero or wake_up flag before sending dropped flush_complete_events. This will avoid unnecessary acks.
Currently it is not set to anything which may result in garbage values for flags field.
ii) Change the dump format of SensorEventConnection.
iii) Add const to method signatures wherever applicable.
Bug id: https://b2.corp.google.com/issues/17498626
Change-Id: Ia736ffb01c366540aab73cdcf596ce852c052593
2014-09-15 20:32:21 +00: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
Dan Albert
7d587c31d5
Merge "Silence warnings about unused parameters."
2014-09-11 02:32:24 +00: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
Dan Albert
5746f14978
am fb017a4c
: Merge "Fix clang warnings about struct vs. class."
...
* commit 'fb017a4c3b23741f737093c3fcb78087bbe5e73c':
Fix clang warnings about struct vs. class.
2014-09-10 01:43:11 +00:00
Dan Albert
9e0e103b65
Silence warnings about unused parameters.
...
Change-Id: I503aafbdeaec3f53241872dc52af9f8b73a1416c
2014-09-09 16:53:59 -07:00
Dan Albert
aeb8ab8c34
Fix clang warnings about struct vs. class.
...
Change-Id: I9f26cd01ac3153efa6d77a4133686842e2d63203
2014-09-09 15:22:48 -07: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
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
Glenn Kasten
4c51a97849
am 91b6028e
: am d44fea68
: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
...
* commit '91b6028e07bc9494afc69ae4f83c3ee49de7d209':
Make IPowerManager native conform to .aidl for oneway
2014-09-08 17:04:24 +00:00
Jesse Hall
e786ecab50
Merge "surfaceflinger: fix -Wunused-parameter warning"
2014-09-06 20:14:47 +00:00
Jesse Hall
12aa86a4f1
Merge "surfaceflinger: fix -Wsign-compare warnings"
2014-09-06 20:14:41 +00:00
Jesse Hall
141f0569c3
Merge "surfaceflinger: fix -Woverloaded-virtual warning"
2014-09-06 20:14:35 +00:00
Jesse Hall
c41cddb897
Merge "surfaceflinger: fix -Wmismatched-tags warnings"
2014-09-06 20:14:27 +00:00
Glenn Kasten
a602086872
Make IPowerManager native conform to .aidl for oneway
...
But provide a temporary escape hatch for AudioFlinger.
This oneway option will be removed as soon as possible.
Bug: 16408906
Change-Id: I20d6da1969ae05b96e72795463470eb4c1f8fbdc
2014-09-05 17:12:24 -07:00
Aravind Akella
ab1ce82009
am 71ec4a81
: am 253c4720
: Merge "SensorService flush fixes." into lmp-dev
...
* commit '71ec4a8179a3f24de04e9a6ac824d896f1835170':
SensorService flush fixes.
2014-09-05 21:33:33 +00:00
Aravind Akella
253c4720af
Merge "SensorService flush fixes." into lmp-dev
2014-09-05 19:53:36 +00:00
Eric Laurent
1e73a2def7
am 2c1eae25
: am 437353a0
: Merge "IPowerManager: make all binder call one way" into lmp-dev
...
* commit '2c1eae259c90d5cfcb7715655f3afd59b7bea9ac':
IPowerManager: make all binder call one way
2014-09-05 18:04:49 +00:00
Eric Laurent
437353a0ef
Merge "IPowerManager: make all binder call one way" into lmp-dev
2014-09-05 17:30:05 +00:00
Jesse Hall
d2e514f717
surfaceflinger: fix -Wunused-parameter warning
...
warning: unused parameter 'mustRecompose' [-Wunused-parameter]
Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
2014-09-05 09:25:01 -07:00
Jesse Hall
f9bfdc6c94
surfaceflinger: fix -Wsign-compare warnings
...
warning: comparison of integers of different signs: 'int' and 'size_t'
(aka 'unsigned int') [-Wsign-compare]
arning: comparison of integers of different signs: 'int32_t' (aka
'int') and 'const uint32_t' (aka 'const unsigned int')
[-Wsign-compare]
Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2
2014-09-05 09:25:01 -07:00
Eric Laurent
f20c329a8a
IPowerManager: make all binder call one way
...
make all binder call to power manager service one way so that
they don't block calling thread and are processed in the
incoming order.
Bug: 16408906.
Change-Id: I94034df7f0a36d967e085b53fdc37fff7b44757b
2014-09-05 09:14:19 -07:00
Michael Wright
22371776ff
am 41943dd0
: am 9e24c319
: Merge "Fix type for temp variable" into lmp-dev
...
* commit '41943dd027740873180bea8d30b65d71f0077654':
Fix type for temp variable
2014-09-04 22:23:17 +00:00
Jesse Hall
382574d116
surfaceflinger: fix -Woverloaded-virtual warning
...
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]
Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
2014-09-04 10:07:28 -07:00
Jesse Hall
646f541050
surfaceflinger: fix -Wmismatched-tags warnings
...
warning: struct 'HWComposer' was previously declared as a class
[-Wmismatched-tags]
warning: class 'DisplayInfo' was previously declared as a struct
[-Wmismatched-tags]
Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e
2014-09-04 10:07:28 -07:00
Aravind Akella
9e3adfcebf
SensorService flush fixes.
...
i) Fix a possible race condition when adding a pending flush connection
to mActiveSensors data structure.
ii) Invalidate flush_complete_events as soon as they are consumed by a
connection so that they are not used by other connections which are
registered for the same sensor.
Change-Id: I1491bea8c2081c4aab1feacc60add13b7aa26bb7
2014-09-03 18:24:05 -07:00
Michael Wright
53047e593d
am 883fccb5
: am bcbf97ef
: Add logging for switch state
...
* commit '883fccb5f89c005502af27a18322f9fa302ac1b3':
Add logging for switch state
2014-09-02 07:09:26 +00:00
Michael Wright
3da3b8436c
Fix type for temp variable
...
Change-Id: I8e2d229da326e5182692f94660336169fb249da7
2014-08-29 16:16:26 -07:00
Michael Wright
bcbf97ef8f
Add logging for switch state
...
Bug: 17004602
Change-Id: I15c9feb7b28274183742936c20e34e7fb07e0b70
2014-08-29 14:31:32 -07:00
Jesse Hall
5c14317f68
am d1a65da9
: am 4d407a0f
: surfaceflinger: Trace HW vsync enable
...
* commit 'd1a65da9e841db9514eac0900a27c1f9a93dd424':
surfaceflinger: Trace HW vsync enable
2014-08-26 14:55:56 +00:00
Jesse Hall
4d407a0f05
surfaceflinger: Trace HW vsync enable
...
This makes it possible to tell whether two HW vsync signals are too
far apart because one was late, or because we turned HW vsync off
briefly between them.
Bug: 17259382
Change-Id: If4fba2a8a6013568349949ce87c5c36f0468d2a2
2014-08-25 16:05:01 -07:00
Aravind Akella
9782334b37
am 47b29a76
: am 5466c3d2
: SensorService fixes
...
* commit '47b29a76cf42856fac7b70e7d901d300231c51d2':
SensorService fixes
2014-08-25 08:23:00 +00:00
Aravind Akella
5466c3d20d
SensorService fixes
...
1) Limit maxEventsToWrite depending on the size of the socket
buffer allocated (Fix for write failure on manta).
2) Do not call flush() if the sensor is not activated (OEM issue).
Change-Id: I81ea78dbdef3a3773af505ca1c9a5e39492c0b48
2014-08-22 17:09:23 -07:00
Michael Lentine
d6ae4a4844
am e2461245
: am eb21986d
: Merge "Update currentConfig variable when active display is changed." into lmp-dev
...
* commit 'e246124516add4f2ed14b21ae38dc76c3439a884':
Update currentConfig variable when active display is changed.
2014-08-22 17:06:42 +00:00
Michael Lentine
eb21986df0
Merge "Update currentConfig variable when active display is changed." into lmp-dev
2014-08-22 16:34:14 +00:00
Aravind Akella
533325d5ca
am 5bee4fc9
: am e74baf6c
: SensorService fixes.
...
* commit '5bee4fc913f215e67503ba6d4e0b6d7e0ba1cc71':
SensorService fixes.
2014-08-22 00:13:15 +00:00
Michael Lentine
d3e6914cea
Update currentConfig variable when active display is changed.
...
Bug: 17182607
Change-Id: I8631c105a9e0fa402a7d9670717becc9857af935
2014-08-21 14:43:13 -07:00
Aravind Akella
e74baf6ca7
SensorService fixes.
...
i) Add more debug stats (acks needed, acks received)
ii) Comment out write failure message.
Change-Id: Iac892a66530849a2dd023d6f5628cd070a79537d
2014-08-21 12:28:35 -07:00
Naseer Ahmed
62914ce664
am 3e70928f
: am 949ea086
: sf: Clear display configs when hot pluggable display is disconnected
...
* commit '3e70928f6e3cd46eb82c02c1cc5fccfd0378bb75':
sf: Clear display configs when hot pluggable display is disconnected
2014-08-21 04:14:37 +00:00
Jesse Hall
42e9434e95
am 11cec5a0
: am d4548dd0
: am 514e30a9
: am c3d1889e
: Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
...
* commit '11cec5a0ef2bc2934928ea476c7c7fad1414a8b2':
surfaceflinger: skip composition for empty frames
2014-08-21 00:57:00 +00:00
Michael Lentine
64144c6562
am d435b56a
: am 4d7c4100
: Merge "Destroy eglSurface before recreating." into lmp-dev
...
* commit 'd435b56ab842f0787c1322d71bb8ed2f5e11b3bc':
Destroy eglSurface before recreating.
2014-08-21 00:57:00 +00:00
Naseer Ahmed
949ea0868d
sf: Clear display configs when hot pluggable display is disconnected
...
Display configs for external displays are stored in the framework
everytime we receive a hot plug to connect. However, since the
configs are not cleared on disconnect, framework will just assume
that the configs are valid. This does not work for use cases when
you connect/disconnect external displays with different resolutions.
e.g. 1080p to 4K and vice-versa
With this change we clear the display configs and repopulate when
we receive a hot plug to connect.
Change-Id: I2eeab186a8d8668a53390a2413b2ce5e044a1845
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
2014-08-20 15:10:14 -07:00
Jesse Hall
d4548dd027
am 514e30a9
: am c3d1889e
: Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
...
* commit '514e30a96cefad109509ce01622fa7f82f3f318c':
surfaceflinger: skip composition for empty frames
2014-08-20 20:02:02 +00:00
Jesse Hall
514e30a96c
am c3d1889e
: Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
...
* commit 'c3d1889e508038efe240ed1974ed377a2e12835c':
surfaceflinger: skip composition for empty frames
2014-08-20 19:52:40 +00:00
Michael Lentine
62d623c6bd
am d0c20394
: am 2cfbef25
: Merge "Fix inverse orientation when original is not applied first." into lmp-dev
...
* commit 'd0c20394d26cb6d1662db6b8f489500c62f8c002':
Fix inverse orientation when original is not applied first.
2014-08-20 15:56:31 +00:00
Michael Lentine
4d7c41008d
Merge "Destroy eglSurface before recreating." into lmp-dev
2014-08-19 22:53:25 +00:00
Michael Lentine
f2568dea41
Destroy eglSurface before recreating.
...
Bug: 16856208
Change-Id: Ifb5c8997afab4bc922356a3542d1f899a2546855
2014-08-20 10:56:34 -07:00
Michael Lentine
7b90258c7b
Fix inverse orientation when original is not applied first.
...
Change-Id: I6f1a11950c77c99800acbf08a672bc1b2310b0b5
2014-08-19 18:16:01 -07:00
Michael Lentine
1440963470
Fix camera orientation by swapping horizontal and vertical flips when needed.
...
Bug: 16637957
Change-Id: I66de597546fdc19e0af9e6150ca20460ab36bf8b
2014-08-19 16:16:35 -07:00
Michael Lentine
2cfbef255b
Merge "Fix inverse orientation when original is not applied first." into lmp-dev
2014-08-19 22:53:25 +00:00
Jesse Hall
b7a0549c98
surfaceflinger: skip composition for empty frames
...
By not committing the results of composition for empty frames, we
avoid spitting out series of black frames for virtual displays that
don't have visible layers. We still draw one black frame when going
from having layers to not having any. In particular, this avoids
having a series of empty frames due to re-compositing the primary
display in the period between creating the virtual display and adding
layers to it.
Bug: 16786752
Change-Id: I7e9b2ed2e407d8d49c7af736b447d4c6181b0ad8
2014-08-19 22:15:43 -07:00
Michael Lentine
62205596b9
Merge "Fix camera orientation by swapping horizontal and vertical flips when needed." into lmp-dev
2014-08-19 02:43:23 +00:00
Michael Lentine
b3abe7c06a
Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev
2014-08-19 15:47:37 +00:00
Michael Lentine
f755140794
Incorporate TransformToDisplayInverse into the crop calculation.
...
Change-Id: Ia9757b3a43d3b8f99df9fef2ed4d11c43b5abdd2
2014-08-18 16:35:43 -07:00
Aravind Akella
a54f3b2f4a
Merge "SensorService fixes." into lmp-dev
2014-08-18 21:31:41 +00:00
Riley Andrews
866399093f
Take advantage of sync points during screen cap.
...
Do not wait for the screen capture to complete within surface flinger,
instead pass a sync point back with the captured gralloc buffer.
Change-Id: I7137c0e0fc710688d1d61f189159418fb27ea263
2014-08-19 19:27:14 +00:00
Aravind Akella
6c2664ae34
SensorService fixes.
...
1) Flush should only be received by the app calling flush(). Maintain
a queue of all flush() calls and send flush_complete events in that
order.
2) Log warnings for older HALs. Remove batch() calls with DRY_RUN flag.
3) Reallocate event cache when more sensors register and the desired
maxCacheSize increases. Clear NEEDS_ACK flag in the buffer whenever
there is a write() failure.
4) More dump information. Add wake-up flag, maxDelay and timestamps for
sensor events.
Bug: 16874778
Change-Id: I195646191059fd31f75f2f07886c0f98bf9b509a
2014-08-19 11:18:25 -07:00
Michael Lentine
dcfa424548
am 1438f6da
: am 62205596
: Merge "Fix camera orientation by swapping horizontal and vertical flips when needed." into lmp-dev
...
* commit '1438f6da7ef3b35e1a20f7824f3fe3e5f9196c16':
Fix camera orientation by swapping horizontal and vertical flips when needed.
2014-08-19 23:57:58 +00:00
Michael Lentine
5fdbe4fc93
am 1b20b8e6
: am b3abe7c0
: Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev
...
* commit '1b20b8e694a8019fd8da1c25323734c15ae9171b':
Incorporate TransformToDisplayInverse into the crop calculation.
2014-08-19 21:19:17 +00:00
Aravind Akella
2fb04ee318
am d553ce40
: am a54f3b2f
: Merge "SensorService fixes." into lmp-dev
...
* commit 'd553ce4092feefd625e4a4cd073a3d18d4b983c9':
SensorService fixes.
2014-08-19 20:42:43 +00:00
Riley Andrews
eed0479f68
am 66a99219
: am 86639909
: Take advantage of sync points during screen cap.
...
* commit '66a9921997e88bc9e89a337fe512a554293e8309':
Take advantage of sync points during screen cap.
2014-08-19 20:10:18 +00:00
Michael Wright
62fbb16383
Shelve InputFlinger for another release. DO NOT MERGE
...
Change-Id: I0f034a2b8b1d9192f61f5001799bd3aa4b3964c7
2014-08-18 10:17:18 -07:00
Michael Lentine
25db8dc7c6
Merge "Change output format to not throw warning on volantis." into lmp-dev
2014-08-06 23:49:20 +00:00
Michael Lentine
b54ee7704e
Change output format to not throw warning on volantis.
...
Change-Id: Id66eb61bdb1ceccfb7aefa0aa70793dac807c257
2014-08-07 14:54:23 -07:00
Michael Lentine
5af281f4ab
Fix HWComposer Surface Crop when surface is rotated
...
Bug: 15091149
Change-Id: I97ecd8af9636da9403fafdb3f9b846f95053ebb7
2014-08-07 13:44:14 -07:00
Michael Lentine
5a35059600
Merge "Fix HWComposer Surface Crop when surface is rotated" into lmp-dev
2014-08-07 15:00:45 +00:00
Michael Wright
78f2444aaf
Revert "Revert "Add system accelerators for BACK and HOME.""
...
This reverts commit d671f98a27
.
Change-Id: Ibec48f81653bd2f755fc59a241fa7836baf53233
2014-08-06 16:59:54 -07:00
Michael Wright
d671f98a27
Revert "Add system accelerators for BACK and HOME."
...
This reverts commit 278b525d25
.
2014-08-06 15:50:43 -07:00
Michael Wright
278b525d25
Add system accelerators for BACK and HOME.
...
Meta+Backspace -> BACK
Meta+Enter -> HOME
Bug: 14066931
Change-Id: Iff1d027300fa9911626785944a6d8efe4f62235e
2014-08-06 19:01:19 +00:00
Eric Penner
a02e9484be
Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev
2014-07-29 21:36:00 +00:00
Eric Penner
51c59cd1e7
SurfaceFlinger: Prevent deadlock by updating an atomic layer set.
...
Bug: 12934849
Change-Id: I9dede7316f1e967de4140bd731ac810115ea302f
2014-07-30 19:05:38 -07:00
Michael Lentine
9ae79d869a
Build fix for size_t on 64bit.
...
Change-Id: Ic16895b30d78ba8a635b709adbae31a590501b20
2014-07-30 16:42:12 -07:00
Michael Lentine
258ee43fbc
Build fix for printf with int64 and size_t
...
Change-Id: I642584cce7dd43e6d491a49228b0bce047d53354
2014-07-30 16:24:48 -07:00
Michael Lentine
fd9d183cd8
Build fix to use the correct source.
...
Change-Id: If36710be600dd0e15c31682e0343f281baa55627
2014-07-30 15:39:17 -07:00